8 files changed, 53 insertions, 50 deletions

diff --git a/noncore/decorations/flat/flat.cpp b/noncore/decorations/flat/flat.cpp
index a2f12be..9a670cc 100644
--- a/noncore/decorations/flat/flat.cpp
+++ b/noncore/decorations/flat/flat.cpp
@@ -286,7 +286,7 @@ void FlatDecoration::drawArea( Area a, QPainter *p, const WindowData *wd ) const
     }
 }
 
-void FlatDecoration::drawButton( Button b, QPainter *p, const WindowData *wd, int x, int y, int w, int h, QWSButton::State state ) const
+void FlatDecoration::drawButton( Button b, QPainter *p, const WindowData *wd, int x, int y, int, int, QWSButton::State state ) const
 {
     QColor c;
     const QColorGroup &cg = wd->palette.active();
@@ -321,7 +321,7 @@ void FlatDecoration::drawButton( Button b, QPainter *p, const WindowData *wd, in
         FlatDecoration *that = (FlatDecoration *)this;
         that->buttonCache.insert( key, img, 1 );
     }
-    
+
     p->drawImage( x, y, *img );
 }
 
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
@@ -30,7 +30,7 @@ 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)
@@ -67,7 +67,7 @@ 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 )
@@ -100,7 +100,7 @@ void Ball::advance(int stage)
 
    // 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 );
@@ -125,7 +125,7 @@ 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 );
@@ -299,7 +299,7 @@ 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 );
@@ -347,7 +347,7 @@ JezzGame::JezzGame( int ballNum, QWidget *parent, const char *name )
                   4*TILE_SIZE + rand() % ( (FIELD_HEIGHT-8)*TILE_SIZE ) );
       ball->show();
    }
-   
+
    // create arrow
    arrow = new Arrow( m_arrowPixmaps, m_field );
    arrow->show();
@@ -374,7 +374,7 @@ 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 );
@@ -413,7 +413,8 @@ void JezzGame::makeBlack()
 
    // 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++ )
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
@@ -58,7 +58,7 @@ void Game::update_info() {
         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;
@@ -72,7 +72,7 @@ void Game::warp_to_level (unsigned int lev) {
                 setup_level(lev);
         }
         else {
-                if (lev<=0) return;
+                if (lev <=0) return;
                 start(lev);
         }
 }
@@ -99,7 +99,7 @@ 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;
@@ -131,10 +131,10 @@ void Game::button_release(int x, int 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
@@ -145,12 +145,12 @@ void Game::button_release(int x, int y) {
                         return;
                 }
         grabbed = EMPTY;
-        }
+}
 
 void Game::update() {
         switch (state) {
         case PLAYING:
-                ui.clear(); 
+                ui.clear();
                 bucket.draw();
                 net.update();
                 net.draw();
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
@@ -4,7 +4,7 @@
 #include "objects.h"
 
 class Game {
-        unsigned state;
+        int state;
         int efficiency;
 public:
         unsigned score, level, iteration;
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
@@ -80,4 +80,4 @@ 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
@@ -16,23 +16,23 @@
  ***************************************************************************/
 
 #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
@@ -28,27 +28,29 @@
 
 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
@@ -109,14 +109,14 @@ 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);
@@ -189,15 +189,15 @@ void ZSameWidget::m_tglboard() {
 }
 
 
-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);
 }
 
@@ -206,7 +206,7 @@ void ZSameWidget::stonesRemoved(int,int) {
         //   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());