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/kbill | |
parent | 046bff8abb6727f5522748a2dc8a259d27b5979b (diff) | |
download | opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.zip opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.tar.gz opie-b8baf551919868737c6f56a05e6efa1bad4d97ac.tar.bz2 |
Remove unused parameter
-rw-r--r-- | noncore/games/kbill/Game.cc | 0 | ||||
-rw-r--r-- | noncore/games/kbill/Game.h | 2 | ||||
-rw-r--r-- | noncore/games/kbill/field.cpp | 0 | ||||
-rw-r--r-- | noncore/games/kbill/inputbox.cpp | 2 | ||||
-rw-r--r-- | noncore/games/kbill/kbill.h | 2 |
5 files changed, 4 insertions, 2 deletions
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 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 @@ -1,55 +1,55 @@ #ifndef GAME_H #define GAME_H #include "objects.h" class Game { - unsigned state; + int state; int efficiency; public: unsigned score, level, iteration; Picture logo; int grabbed; static const unsigned short scrwidth = 240; static const unsigned short scrheight = 290; static const int PLAYING = 1; static const int BETWEEN = 2; static const int END = 3; static const int WAITING = 4; static const int DEFAULTC = 0; /* cursors */ static const int DOWNC = -1; static const int BUCKETC = -2; static const int ENDGAME = 200; /* dialog window IDs */ static const int ENTERNAME = 201; static const int HIGHSCORE = 202; static const int SCORE = 203; static const int ENDLEVEL = -1; /* Codes for updating score */ static const int BILLPOINTS = 5; static const int EMPTY = -2; /* Grabbed object */ static const int BUCKET = -1; int RAND(int lb, int ub); int MAX(int x, int y); int MIN(int x, int y); int INTERSECT(int x1, int y1, int w1, int h1, int x2, int y2, int w2, int h2); void setup_level (unsigned int lev); void start(unsigned int lev); void quit(); void update_info(); void update_score (int action); void warp_to_level (unsigned int lev); void button_press(int x, int y); void button_release(int x, int y); void update(); void main(int argc, char **argv); }; #endif 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 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 @@ -1,50 +1,50 @@ /*************************************************************************** inputbox.cpp - description ------------------- begin : Sat Jan 1 2000 copyright : (C) 2000 by Jurrien Loonstra email : j.h.loonstra@st.hanze.nl ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #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()) ); } InputBox::~InputBox(){ delete ok; delete cancel; delete question; delete input; } QString InputBox::getText() const{ return input->text(); } 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 @@ -1,54 +1,56 @@ /*************************************************************************** kbill.h - description ------------------- begin : Thu Dec 30 16:55:55 CET 1999 copyright : (C) 1999 by Jurrien Loonstra email : j.h.loonstra@st.hanze.nl ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef KBILL_H #define KBILL_H #include <qmainwindow.h> #include <qwidget.h> #include <qpopupmenu.h> #include "field.h" class KBill : public QMainWindow { 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(); +protected: friend class UI; }; #endif |