author | zecke <zecke> | 2004-09-10 11:14:02 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-10 11:14:02 (UTC) |
commit | b8baf551919868737c6f56a05e6efa1bad4d97ac (patch) (side-by-side diff) | |
tree | 402c587e55356aff7f13990e1efcf57775bb9670 /noncore/games | |
parent | 046bff8abb6727f5522748a2dc8a259d27b5979b (diff) | |
download | opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.zip opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.tar.gz opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.tar.bz2 |
Remove unused parameter
-rw-r--r-- | noncore/games/bounce/game.cpp | 17 | ||||
-rw-r--r-- | noncore/games/kbill/Game.cc | 14 | ||||
-rw-r--r-- | noncore/games/kbill/Game.h | 2 | ||||
-rw-r--r-- | noncore/games/kbill/field.cpp | 2 | ||||
-rw-r--r-- | noncore/games/kbill/inputbox.cpp | 10 | ||||
-rw-r--r-- | noncore/games/kbill/kbill.h | 42 | ||||
-rw-r--r-- | noncore/games/zsame/ZSameWidget.cpp | 12 |
7 files changed, 51 insertions, 48 deletions
diff --git a/noncore/games/bounce/game.cpp b/noncore/games/bounce/game.cpp index bbd3d0b..5ef9f15 100644 --- a/noncore/games/bounce/game.cpp +++ b/noncore/games/bounce/game.cpp @@ -29,9 +29,9 @@ using namespace Opie::Core; /* STD */ #include <stdlib.h> -#define TILE_SIZE 9 +#define TILE_SIZE 9 #define TILE_FIRST ((FIELD_WIDTH-2)*(FIELD_HEIGHT-2)) #define TILE_FREE (TILE_FIRST + 0) #define TILE_BORDER (TILE_FIRST + 1) @@ -66,9 +66,9 @@ void Arrow::changeDirection() { m_vertical = ! m_vertical; update(); } - + Ball::Ball(QCanvasPixmapArray* array, QCanvas* canvas) : QCanvasSprite( array, canvas ), m_animDelay( 0 ), m_soundDelay( MS2TICKS(BALL_ANIM_DELAY)/2 ) { @@ -99,9 +99,9 @@ void Ball::advance(int stage) if ( !reflectX && !reflectY && collide(xVelocity(), yVelocity()) ) reflectX = reflectY = true; // emit collision QRect r = boundingRect(); - r.moveBy( xVelocity(), yVelocity() ); + r.moveBy( static_cast<int>(xVelocity()), static_cast<int>( yVelocity() ) ); JezzField* field = (JezzField *)canvas(); int ul = field->tile( r.left() / TILE_SIZE, r.top() / TILE_SIZE ); int ur = field->tile( r.right() / TILE_SIZE, r.top() / TILE_SIZE ); @@ -124,9 +124,9 @@ void Ball::advance(int stage) bool Ball::collide( double dx, double dy ) { QRect r = boundingRect(); - r.moveBy( dx, dy ); + r.moveBy( static_cast<int>( dx ), static_cast<int>( dy ) ); JezzField* field = (JezzField *)canvas(); int ul = field->tile( r.left() / TILE_SIZE, r.top() / TILE_SIZE ); int ur = field->tile( r.right() / TILE_SIZE, r.top() / TILE_SIZE ); @@ -298,9 +298,9 @@ void JezzView::changeCursor() JezzGame::JezzGame( int ballNum, QWidget *parent, const char *name ) : QWidget( parent, name ), m_wall1( 0 ), m_wall2( 0 ), m_text( 0 ), m_running( false ), m_percent( 0 ), m_pictured( false ) { - QString path = QPEApplication::qpeDir()+"pics/bounce/"; + QString path = QPEApplication::qpeDir()+"pics/bounce/"; // load gfx m_ballPixmaps = new QCanvasPixmapArray( path + "ball%1.png", 25 ); for ( unsigned n=0; n < m_ballPixmaps->count(); n++ ) @@ -346,9 +346,9 @@ JezzGame::JezzGame( int ballNum, QWidget *parent, const char *name ) ball->move( 4*TILE_SIZE + ( rand() - 50 ) % ( (FIELD_WIDTH-8)*TILE_SIZE ), 4*TILE_SIZE + rand() % ( (FIELD_HEIGHT-8)*TILE_SIZE ) ); ball->show(); } - + // create arrow arrow = new Arrow( m_arrowPixmaps, m_field ); arrow->show(); @@ -373,9 +373,9 @@ JezzGame::~JezzGame() } void JezzGame::display( QString text, int size ) { - odebug << "This function \"display\" shouldn't be called!!!" << oendl; + odebug << "This function \"display\" shouldn't be called!!!" << oendl; if ( !text.isEmpty() ) { QFont font( "Helvetica", size, QFont::Bold ); font.setStyleHint( QFont::Helvetica ); @@ -412,9 +412,10 @@ void JezzGame::makeBlack() m_buf[x][y] = m_field->tile( x, y ); // fill areas that contains a ball for ( Ball *ball=m_balls.first(); ball!=0; ball=m_balls.next() ) - fill( ball->x()/TILE_SIZE, ball->y()/TILE_SIZE ); + fill( static_cast<int>( ball->x()/TILE_SIZE ), + static_cast<int>( ball->y()/TILE_SIZE ) ); // areas still free can be blacked now for ( int y=0; y<FIELD_HEIGHT; y++ ) for ( int x=0; x<FIELD_WIDTH; x++ ) diff --git a/noncore/games/kbill/Game.cc b/noncore/games/kbill/Game.cc index 624b50b..4cd5322 100644 --- a/noncore/games/kbill/Game.cc +++ b/noncore/games/kbill/Game.cc @@ -57,9 +57,9 @@ void Game::update_info() { net.win, level, score); ui.draw_str(str, 5, scrheight-5); efficiency += ((100*net.base-10*net.win)/net.units); } - + void Game::update_score (int action) { switch (action){ case ENDLEVEL: score+=(level*efficiency/iteration); break; default: score+=(action*action*BILLPOINTS); @@ -71,9 +71,9 @@ void Game::warp_to_level (unsigned int lev) { if (lev <= level) return; setup_level(lev); } else { - if (lev<=0) return; + if (lev <=0) return; start(lev); } } @@ -98,9 +98,9 @@ void Game::button_press(int x, int y) { } else if (bill.list[i].state != bill.list[i].STRAY && bill.list[i].clicked(x, y)) { - if (bill.list[i].state == bill.list[i].AT) + if (bill.list[i].state == bill.list[i].AT) net.computers[bill.list[i].target_c].busy=0; bill.list[i].index = -1; bill.list[i].cels = bill.dcels; bill.list[i].x_offset = -2; @@ -130,12 +130,12 @@ void Game::button_release(int x, int y) { if (net.computers[i].oncomputer(x, y) && net.computers[i].compatible (bill.list[grabbed].cargo) && - (net.computers[i].os == OS.WINGDOWS || + (net.computers[i].os == OS.WINGDOWS || net.computers[i].os == OS.OFF)) { - net.base++; + net.base++; if (net.computers[i].os == OS.WINGDOWS) net.win--; else net.off--; @@ -144,14 +144,14 @@ void Game::button_release(int x, int y) { grabbed = EMPTY; return; } grabbed = EMPTY; -} +} void Game::update() { switch (state) { case PLAYING: - ui.clear(); + ui.clear(); bucket.draw(); net.update(); net.draw(); bill.update(); diff --git a/noncore/games/kbill/Game.h b/noncore/games/kbill/Game.h index 4473936..5c9c497 100644 --- a/noncore/games/kbill/Game.h +++ b/noncore/games/kbill/Game.h @@ -3,9 +3,9 @@ #include "objects.h" class Game { - unsigned state; + int state; int efficiency; public: unsigned score, level, iteration; Picture logo; diff --git a/noncore/games/kbill/field.cpp b/noncore/games/kbill/field.cpp index a974ab2..0dd8d72 100644 --- a/noncore/games/kbill/field.cpp +++ b/noncore/games/kbill/field.cpp @@ -79,5 +79,5 @@ void Field::Timer(){ } void Field::paintEvent(QPaintEvent *) { bitBlt(this, 0, 0, pix); -}
\ No newline at end of file +} diff --git a/noncore/games/kbill/inputbox.cpp b/noncore/games/kbill/inputbox.cpp index 5087fbb..7aaebe7 100644 --- a/noncore/games/kbill/inputbox.cpp +++ b/noncore/games/kbill/inputbox.cpp @@ -15,25 +15,25 @@ * * ***************************************************************************/ #include "inputbox.h" -InputBox::InputBox(QWidget *parent, const char *name, const char *caption, const char *text) : QDialog(parent, name, TRUE) { +InputBox::InputBox(QWidget *parent, const char *name, const char *, const char *) : QDialog(parent, name, TRUE) { // setCaption(caption); -// +// // question = new QLabel(this); // question->setText(text); // question->setGeometry(10, 10, 240, 50); -// +// // input = new QLineEdit(this); // input->setGeometry(10, 60, 240, 30); // input->setFocus(); // input->setMaxLength(19); -// +// // ok = new QPushButton( "Ok", this ); // ok->setGeometry(10, 100, 100,30 ); // ok->setDefault(TRUE); // connect( ok, SIGNAL(clicked()), SLOT(accept()) ); -// +// // cancel = new QPushButton( "Cancel", this ); // cancel->setGeometry(150, 100, 100,30 ); // connect( cancel, SIGNAL(clicked()), SLOT(reject()) ); } diff --git a/noncore/games/kbill/kbill.h b/noncore/games/kbill/kbill.h index fbc0c6c..da1a111 100644 --- a/noncore/games/kbill/kbill.h +++ b/noncore/games/kbill/kbill.h @@ -27,28 +27,30 @@ #include "field.h" class KBill : public QMainWindow { - Q_OBJECT - public: + Q_OBJECT +public: KBill(); - ~KBill(); - Field* getField(); - private: - QMenuBar *menu; - QPopupMenu *file, *help; - Field *field; - int pauseid; - protected slots: - void Quit(); - void About(); - void NewGame(); - void Pause(); - void WarpTo(); - void Story(); - void Rules(); - void ViewHighScores(); - - friend class UI; + ~KBill(); + Field* getField(); +private: + QMenuBar *menu; + QPopupMenu *file, *help; + Field *field; + int pauseid; + +protected slots: + void Quit(); + void About(); + void NewGame(); + void Pause(); + void WarpTo(); + void Story(); + void Rules(); + void ViewHighScores(); + +protected: + friend class UI; }; #endif diff --git a/noncore/games/zsame/ZSameWidget.cpp b/noncore/games/zsame/ZSameWidget.cpp index 4fab0f6..04ad825 100644 --- a/noncore/games/zsame/ZSameWidget.cpp +++ b/noncore/games/zsame/ZSameWidget.cpp @@ -108,16 +108,16 @@ ZSameWidget::ZSameWidget( QWidget* parent, const char* name, WFlags fl ) ZSameWidget::~ZSameWidget() { } -void ZSameWidget::readProperties(Config *conf) { +void ZSameWidget::readProperties(Config *) { /* Q_ASSERT(conf); stone->readProperties(conf); */ } -void ZSameWidget::saveProperties(Config *conf) { +void ZSameWidget::saveProperties(Config *) { /* Q_ASSERT(conf); stone->saveProperties(conf); conf->sync(); @@ -188,26 +188,26 @@ void ZSameWidget::m_tglboard() { // kdDebug() << "toggled" << endl; } -void ZSameWidget::setColors(int colors) { +void ZSameWidget::setColors(int ) { // status->changeItem(i18n("%1 Colors").arg(colors),1); } -void ZSameWidget::setBoard(int board) { +void ZSameWidget::setBoard(int ) { // status->changeItem(i18n("Board: %1").arg(board, 6), 2); } -void ZSameWidget::setMarked(int m) { +void ZSameWidget::setMarked(int ) { // status->changeItem(i18n("Marked: %1").arg(m, 6),3); } void ZSameWidget::stonesRemoved(int,int) { // KNotifyClient::event("stones removed", // i18n("%1 stones removed.").arg(stone->marked())); } -void ZSameWidget::setScore(int score) { +void ZSameWidget::setScore(int ) { // status->changeItem(i18n("Score: %1").arg(score, 6),4); // undo->setEnabled(stone->undoPossible()); // restart->setEnabled(!stone->isOriginalBoard()); } |