applied the patch generated by the optimize_connect script from

TT.

4 files changed, 11 insertions, 11 deletions

diff --git a/noncore/games/bounce/game.cpp b/noncore/games/bounce/game.cpp
index c07f453..1f1f8cd 100644
--- a/noncore/games/bounce/game.cpp
+++ b/noncore/games/bounce/game.cpp
@@ -276,103 +276,103 @@ void JezzView::viewportMouseReleaseEvent( QMouseEvent *ev )
 void JezzView::changeCursor()
 {
         m_vertical = !m_vertical;
         if ( m_vertical )
         {
                 setCursor( sizeVerCursor );
         }
         else
         {
                 setCursor( sizeHorCursor );
         }
 }
 
 /*************************************************************************/
 
 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/"; 
 
    // load gfx
    m_ballPixmaps = new QCanvasPixmapArray( path + "ball%1.png", 25 );
    for ( unsigned n=0; n < m_ballPixmaps->count(); n++ )
        m_ballPixmaps->image(n)->setOffset( 0, 0 );
 
    m_arrowPixmaps = new QCanvasPixmapArray( path + "arrow%1.png", 2 );
    for ( unsigned n=0; n < m_arrowPixmaps->count(); n++ )
        m_arrowPixmaps->image(n)->setOffset( 0, 0 );
 
    QPixmap tiles( path + "tiles.png" );
 
    // create field
    m_field = new JezzField( tiles, this, "m_field" );
    m_field->resize( TILE_SIZE*FIELD_WIDTH, TILE_SIZE*FIELD_HEIGHT );
 
    for ( int x=0; x<FIELD_WIDTH; x++ )
          m_field->setTile( x, 0, TILE_BORDER );
    for ( int y=1; y<FIELD_HEIGHT-1; y++ )
    {
       m_field->setTile( 0, y, TILE_BORDER );
       for ( int x=1; x<FIELD_WIDTH-1; x++ )
          m_field->setTile( x, y, TILE_FREE );
       m_field->setTile( FIELD_WIDTH-1, y, TILE_BORDER );
    }
    for ( int x=0; x<FIELD_WIDTH; x++ )
          m_field->setTile( x, FIELD_HEIGHT-1, TILE_BORDER );
 
-   connect( m_field, SIGNAL(ballCollision(Ball *, int, int, int)), this, SLOT(ballCollision(Ball *, int, int, int)) );
+   connect( m_field, SIGNAL(ballCollision(Ball*,int,int,int)), this, SLOT(ballCollision(Ball*,int,int,int)) );
 
    // create view
    m_view = new JezzView( m_field, this, "m_view" );
    m_view->move( 0, 0 );
    m_view->adjustSize();
-   connect( m_view, SIGNAL(buildWall(int, int, bool)), this, SLOT(buildWall(int, int, bool)) );
+   connect( m_view, SIGNAL(buildWall(int,int,bool)), this, SLOT(buildWall(int,int,bool)) );
 
    // create balls
    for ( int n=0; n<ballNum; n++ )
    {
       Ball *ball = new Ball( m_ballPixmaps, m_field );
       m_balls.append( ball );
       ball->setVelocity( ((rand() & 1)*2-1)*2, ((rand() & 1)*2-1)*2 );
       ball->setFrame( rand() % 25 );
       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();
 
    // create text label
    m_text = new QCanvasText( m_field );
 
    // create game clock
    m_clock = new QTimer( this );
    connect( m_clock, SIGNAL(timeout()), this, SLOT(tick()) );
    m_clock->start( GAME_DELAY );
 
    // setup geometry
    setFixedSize( m_view->size() );
 }
 
 JezzGame::~JezzGame()
 {
     m_balls.clear();
     delete m_view;
     delete m_field;
     delete m_ballPixmaps;
 }
 
 void JezzGame::display( QString text, int size )
 {
     qDebug("This function \"display\" shouldn't be called!!!");
     if ( !text.isEmpty() )
     {
         QFont font( "Helvetica", size, QFont::Bold );
         font.setStyleHint( QFont::Helvetica );
         m_text->setFont( font );
         m_text->setText( text );
 
         QRect size = m_text->boundingRect();
@@ -480,107 +480,107 @@ void JezzGame::ballCollision( Ball*, int, int, int tile )
       // stop walls
       if ( (tile==TILE_WALLUP || tile==TILE_WALLLEFT) && m_wall1 )
       {
           m_wall1->finish();
           m_wall1->fill( false );
           delete m_wall1;
           m_wall1 = 0;
       }
 
       if ( (tile==TILE_WALLDOWN || tile==TILE_WALLRIGHT) && m_wall2 )
       {
           m_wall2->finish();
           m_wall2->fill( false );
           delete m_wall2;
           m_wall2 = 0;
       }
 
       // update view
       m_field->update();
       m_view->repaint();
 
       // send death msg
       emit died();
    }
 }
 
 void JezzGame::buildWall( int x, int y, bool vertical )
 {
     if ( !m_running ) return;
 
    if ( m_field->tile(x, y)==TILE_FREE )
    {
       // check whether there is a ball at the moment
       QCanvasItemList cols = m_field->collisions( QRect(x*TILE_SIZE, y*TILE_SIZE, TILE_SIZE, TILE_SIZE) );
       if ( cols.count()>0 )
       {
          //kdDebug() << "Direct collision" << endl;
          emit ballCollision( (Ball*)cols.first(), x, y, TILE_WALLUP );
          return;
       }
 
       // start walls
       if ( !m_wall1 )
       {
          m_wall1 = new Wall( m_field, x, y,
                              vertical? Wall::Up : Wall::Left,
                              vertical? TILE_WALLUP : TILE_WALLLEFT,
                              this, "m_wall1" );
-         connect( m_wall1, SIGNAL(finished(Wall *, int)),
-                  this, SLOT(wallFinished(Wall *, int)) );            }
+         connect( m_wall1, SIGNAL(finished(Wall*,int)),
+                  this, SLOT(wallFinished(Wall*,int)) );            }
 
       if ( !m_wall2 )
       {
          m_wall2 = new Wall( m_field, x, y,
                              vertical? Wall::Down: Wall::Right,
                              vertical? TILE_WALLDOWN : TILE_WALLRIGHT,
                              this, "m_wall2" );
-         connect( m_wall2, SIGNAL(finished(Wall *, int)),
-                  this, SLOT(wallFinished(Wall *, int)) );
+         connect( m_wall2, SIGNAL(finished(Wall*,int)),
+                  this, SLOT(wallFinished(Wall*,int)) );
       }
    }
 }
 
 void JezzGame::wallFinished( Wall *wall, int tile )
 {
     if ( tile==TILE_WALLEND )
     {
         if ( m_wall1 )
         {
             m_wall1->fill( false );
             delete m_wall1;
             m_wall1 = 0;
         }
 
         if ( m_wall2 )
         {
             m_wall2->fill( false );
             delete m_wall2;
             m_wall2 = 0;
         }
     } else
     {
         if ( m_wall1==wall && m_wall1 )
         {
             m_wall1->fill( true );
             delete m_wall1;
             m_wall1 = 0;
         }
 
         if ( m_wall2==wall && m_wall2 )
         {
             m_wall2->fill( true );
             delete m_wall2;
             m_wall2 = 0;
         }
     }
 
     m_field->update();
     m_view->repaint();
 
     makeBlack();
 }
 
 void JezzGame::tick()
 {
     if ( m_running )
     {
diff --git a/noncore/games/buzzword/buzzword.cpp b/noncore/games/buzzword/buzzword.cpp
index 13eb481..b7f2573 100644
--- a/noncore/games/buzzword/buzzword.cpp
+++ b/noncore/games/buzzword/buzzword.cpp
@@ -66,97 +66,97 @@ void BuzzItem::flip()
         label->setBackgroundColor(label->colorGroup().highlight());
         emit clicked(_row, _column);
 }
 
 BuzzWord::BuzzWord(QWidget* parent, const char* name, WFlags fl ) : QMainWindow( parent,  name, fl )
 {
         setCaption(tr("buZzword"));
 
         menu = menuBar();
         game = new QPopupMenu;
         game->insertItem(tr("&New game"), this, SLOT(newGame()), Key_N );
         menu->insertItem( tr("&Game"), game );
 
         gridVal = 4;
         grid = NULL;
         gameOver = false;
         newGame();
 }
 
 void BuzzWord::drawGrid()
 {
         QStringList l;
 
         QString path = QPEApplication::qpeDir()+"share/buzzword/";
         QFile f( path + "buzzwords" );
         if ( !f.open( IO_ReadOnly ) )
                 return;
 
         QTextStream t( &f );
 
         while (!t.atEnd())
         {
                 l << t.readLine();
         }
 
         f.close();
 
         grid = new QGrid(gridVal, this);
         //grid->setFixedSize( 480, 480 );
 
         for( int c = 0 ; c < gridVal ; c++ )
         {
                 for( int r = 0 ; r < gridVal ; r++ )
                 {
                         uint pos = rand() % l. count();
 
                         QString word = QStringList::split(" ", l[pos]).join("\n");
                         BuzzItem* bi = new BuzzItem( c, r, word, grid );
-                        connect( bi, SIGNAL(clicked(int, int)), this, SLOT(clicked(int,int)) );
+                        connect( bi, SIGNAL(clicked(int,int)), this, SLOT(clicked(int,int)) );
                         map[c][r] = 0;
 
                         l.remove( l.at( pos ));
                 }
         }
 }
 
 void BuzzWord::clicked(int row, int column)
 {
         if ( ! gameOver )
         {
                 int rowTotal = 0;
                 int columnTotal = 0;
 
                 map[column][row] = 1;
 
                 for( int c = 0 ; c < gridVal ; c++ )
                 {
                         for( int r = 0 ; r < gridVal ; r++ )
                         {
                                 if ( map[c][r] == 1 )
                                         rowTotal++;
 
                                 if ( rowTotal == 4 )
                                 {
                                         bingo();
                                 }
                         }
                         rowTotal = 0;
                 }
 
                 for( int r = 0 ; r < gridVal ; r++ )
                 {
                         for( int c = 0 ; c < gridVal ; c++ )
                         {
                                 if ( map[c][r] == 1 )
                                         columnTotal++;
 
                                 if ( columnTotal == 4 )
                                 {
                                         bingo();
                                 }
                         }
                         columnTotal = 0;
                 }
 
                 if ( map[0][0] && map[1][1] && map[2][2] && map[3][3] )
                         bingo();
diff --git a/noncore/games/kpacman/kpacman.cpp b/noncore/games/kpacman/kpacman.cpp
index be2e46d..9820e5a 100644
--- a/noncore/games/kpacman/kpacman.cpp
+++ b/noncore/games/kpacman/kpacman.cpp
@@ -1,85 +1,85 @@
 
 #include "portable.h"
 
 #if defined( KDE2_PORT )
 #include <kpacman.h>
 #include <kpacman.moc>
 #include <kcolordlg.h>
 #elif defined( QPE_PORT )
 #include <qmenubar.h>
 #include <qpe/config.h>
 #include <qapplication.h>
 #include "kpacman.h"
 #endif
 
 
 Kpacman::Kpacman(QWidget *parent, const char *name)
         : KTMainWindow(parent, name)
 {
     schemesPopup = new QList<QPopupMenu>;
     schemesPopup->setAutoDelete(TRUE);
 
     menu();
 
         m_view = new QWidget( this, "m_view" );
     m_view->setBackgroundColor( black );
         m_layout = new QGridLayout( m_view );
         m_layout->setMargin( 7 );
 
         view = new KpacmanWidget( this, QString(name)+"widget");
         m_layout->addWidget( view, 0, 0 );
 
     setCaption( tr("KPacman") );
 
     view->referee->setFocus();
 
-    connect(view->referee, SIGNAL(setScore(int, int)),
-            view->score, SLOT(setScore(int, int)));
+    connect(view->referee, SIGNAL(setScore(int,int)),
+            view->score, SLOT(setScore(int,int)));
     connect(view->referee, SIGNAL(setPoints(int)),
             view->score, SLOT(set(int)));
     connect(view->referee, SIGNAL(setLifes(int)),
             view->status, SLOT(setLifes(int)));
     connect(view->referee, SIGNAL(setLevel(int)),
             view->status, SLOT(setLevel(int)));
     connect(view->referee, SIGNAL(forcedHallOfFame(bool)),
             this, SLOT(forcedHallOfFame(bool)));
     connect(view->referee, SIGNAL(togglePaused()), this, SLOT(togglePaused()));
     connect(view->referee, SIGNAL(toggleNew()), this, SLOT(toggleNew()));
 
     connect(view->score, SIGNAL(toggleNew()), this, SLOT(toggleNew()));
     connect(view->score, SIGNAL(forcedHallOfFame(bool)),
             this, SLOT(forcedHallOfFame(bool)));
 
     APP_CONFIG_BEGIN( cfg );
     focusOutPause = !cfg->readBoolEntry("FocusOutPause", TRUE);
     focusInContinue = !cfg->readBoolEntry("FocusInContinue", TRUE);
     hideMouseCursor = !cfg->readBoolEntry("HideMouseCursor", TRUE);
     APP_CONFIG_END( cfg );
 
     toggleFocusOutPause();
     toggleFocusInContinue();
     toggleHideMouseCursor();
 
     setCentralWidget( m_view );
 }
 
 Kpacman::~Kpacman()
 {
   /* APP_CONFIG_BEGIN( cfg );
     cfg->writeEntry("FocusOutPause", focusOutPause);
     cfg->writeEntry("FocusInContinue", focusInContinue);
     cfg->writeEntry("HideMouseCursor", hideMouseCursor);
     APP_CONFIG_END( cfg );
   */
     delete _menuBar;
 }
 
 void Kpacman::menu()
 {
     gamePopup = new QPopupMenu();
     CHECK_PTR( gamePopup );
     newID = gamePopup->insertItem(tr("&New"), this, SLOT(newKpacman()),Key_F2);
     pauseID = gamePopup->insertItem(tr("&Pause"),
                                     this, SLOT(pauseKpacman()), Key_F3);
     hofID = gamePopup->insertItem(tr("&Hall of fame"),
                                     this, SLOT(toggleHallOfFame()), Key_F4);
diff --git a/noncore/games/oyatzee/oyatzee.cpp b/noncore/games/oyatzee/oyatzee.cpp
index 86318db..a55aa73 100644
--- a/noncore/games/oyatzee/oyatzee.cpp
+++ b/noncore/games/oyatzee/oyatzee.cpp
@@ -1,80 +1,80 @@
 #include "oyatzee.h"
 
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qpainter.h>
 #include <qlayout.h>
 
 #include <stdlib.h>
 
 OYatzee::OYatzee( QWidget *parent , const char *name, WFlags fl ) : QMainWindow( parent , name , fl )
 {
         QWidget *thing = new QWidget( this );
         setCentralWidget( thing );
 
         setCaption( tr( "OYatzee" ) );
 
         setPlayerNumber( 4 );
         setRoundsNumber( 1 );
 
         lastPlayerFinished = false;
         currentPlayer = 1;
         
         ps.append( new Player( "Carsten" ) );
         ps.append( new Player( "Julia" ) );
         ps.append( new Player( "Christine" ) );
         ps.append( new Player( "Stephan" ) );
 
         
         QVBoxLayout *vbox = new QVBoxLayout( thing );
 
         sb = new Scoreboard( ps, thing , "sb" );
-        connect( sb->pb , SIGNAL( item( int ) ), this , SLOT( slotEndRound( int ) ) );
+        connect( sb->pb , SIGNAL( item(int) ), this , SLOT( slotEndRound(int) ) );
         
         dw = new DiceWidget( thing , "dw" );
         dw->setMaximumHeight( this->height()/4 );
         connect( dw->rollButton, SIGNAL( clicked() ), this , SLOT( slotRollDices() ) );
         
         vbox->addWidget( sb );
         vbox->addWidget( dw );
 }
 
 void OYatzee::slotEndRound( int item )
 {
         qDebug( "Der User hat Nummer %d ausgewählt" , item );
 
         /*
          * if the user clicked on Total, Bonus or Score and thus not on a 
          * selectable item return and do nothing
          */
         if ( item == 7 || item == 8 || item == 16 ) return;
 
         /*
          * check if the user can really click on that item
          */
         if ( posibilities.find( item ) == posibilities.end() ) return;
         
         QValueListInt numbers;
         
         Dice *d = dw->diceList.first();
         for ( ; d != 0 ; d = dw->diceList.next() )
         {
                 numbers.append( d->hasValue() );
         }
 
         int points = 0;
 
         switch ( item )
         {
                 case Ones:
                         points = getPoints( 1 , numbers );
                         break;
                 case Twos:
                         points = getPoints( 2 , numbers );
                         break;
                 case Threes:
                         points = getPoints( 3 , numbers );
                         break;
                 case Fours:
                         points = getPoints( 4 , numbers );
                         break;
@@ -601,87 +601,87 @@ void Resultboard::paintEvent( QPaintEvent* )
         QPainter p;
         p.begin( this );
         
         const int cell_width = this->width();
         const int cell_height = this->height()/17;
         
         pointMap::Iterator it = pMap.begin();
         for ( ; it != pMap.end() ; ++it )
         {
                 int i = it.key();
                 qDebug( "ok: %d , %d" , i , it.data() );
                 p.drawText( 0, i*cell_height , cell_width , cell_height , Qt::AlignCenter , QString::number( it.data() ) );
         }
 
         p.drawText( 0,0,cell_width,cell_height, Qt::AlignCenter , pName ); //Playername
 }
 
 
 void Resultboard::updateMap( int item , int points )
 {
         pMap.insert( item , points );
 
         update();
 }
 
 /*
  * Possibilityboard
  */
 
 Possibilityboard::Possibilityboard( QWidget *parent , const char* name ) : Board ( parent , name )
 {
         begriffe.append( "1er" );
         begriffe.append( "2er" );
         begriffe.append( "3er" );
         begriffe.append( "4er" );
         begriffe.append( "5er" );
         begriffe.append( "6er" );
         begriffe.append( "Total" );
         begriffe.append( "Bonus" );
         begriffe.append( "3oaK" );
         begriffe.append( "4oaK" );
         begriffe.append( "Full House" );
         begriffe.append( "Short S" );
         begriffe.append( "Long S" );
         begriffe.append( "Yatzee!" );
         begriffe.append( "Chance" );
         begriffe.append( "Score" );
         
-        connect( this , SIGNAL( clicked( QPoint ) ), this , SLOT( slotClicked( QPoint ) ) );
+        connect( this , SIGNAL( clicked(QPoint) ), this , SLOT( slotClicked(QPoint) ) );
 }
 
 void Possibilityboard::slotClicked( QPoint p)
 {
         emit item( p.y()/(this->height()/17) );
 }
 
 void Possibilityboard::paintEvent( QPaintEvent* )
 {
         QPainter p;
         p.begin( this );
 
         const int cell_width = this->width();
         const int cell_height = this->height()/17;
 
         p.setBrush( Qt::blue );
 
         QValueListInt::Iterator listIt = list.begin();
         for ( ; listIt != list.end() ; ++listIt )
         {
                 p.drawRect( 0 , (*listIt) * cell_height , cell_width , cell_height );
         }
 
         p.setBrush( Qt::black );
         p.setBrush( Qt::NoBrush );
         QStringList::Iterator begriffeIt = begriffe.begin();
         for ( int i = 1 ; i < 18 ; ++i )
         {
                 p.drawText( 0 , i*cell_height , cell_width , cell_height , Qt::AlignCenter , *begriffeIt );
                 ++begriffeIt;
         }
 }
 
 void Possibilityboard::setIntlist( QValueListInt &l )
 {
         list = l;
 }