run the optimize_connect script

the whole cvs is tagged with "before_optimize_connect" if there are problems you
can check the diff (but it had compiled and run here)

4 files changed, 26 insertions, 26 deletions

diff --git a/inputmethods/handwriting/qimpenhelp.cpp b/inputmethods/handwriting/qimpenhelp.cpp
index a294301..0727931 100644
--- a/inputmethods/handwriting/qimpenhelp.cpp
+++ b/inputmethods/handwriting/qimpenhelp.cpp
@@ -150,61 +150,61 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
     charList = new QListBox( this );
     charList->setHScrollBarMode( QListBox::AlwaysOff );
     charList->setFixedWidth(80);
     connect( charList, SIGNAL(highlighted(int)), this, SLOT(selectChar(int)) );
     gl->addWidget(charList, 1, 0);
 
     result = new QLabel( this );
     result->setAlignment(AlignLeft | AlignVCenter | WordBreak);
     result->setText(
         tr( "Select a reference character from the list.  Practice writing in "
             "the area on the right."));
     gl->addMultiCellWidget(result, 1, 2, 1, 1);
 
     matcher = new QIMPenMatch( this );
     matcher->setCharSet( currentSet );
     connect( matcher, SIGNAL(noMatch()), this, SLOT(noMatch()) );
-    connect( matcher, SIGNAL(matchedCharacters(const QIMPenCharMatchList &)),
-             this, SLOT(matched(const QIMPenCharMatchList &)) );
+    connect( matcher, SIGNAL(matchedCharacters(const QIMPenCharMatchList&)),
+             this, SLOT(matched(const QIMPenCharMatchList&)) );
 
     QHBoxLayout *hb = new QHBoxLayout();
     gl->addLayout( hb, 2, 0 );
     prevBtn = new QPushButton( this );
     prevBtn->setPixmap( QPixmap( (const char **)left_xpm ) );
     connect( prevBtn, SIGNAL(clicked()), SLOT(prevChar()));
     hb->addWidget( prevBtn );
 
     nextBtn = new QPushButton( this );
     nextBtn->setPixmap( QPixmap( (const char **)right_xpm ) );
     connect( nextBtn, SIGNAL(clicked()), SLOT(nextChar()));
     hb->addWidget( nextBtn );
 
     refPw = new QIMPenWidget( this );
     refPw->setReadOnly( TRUE );
     gl->addWidget( refPw, 3, 0 );
 
     pracPw = new QIMPenWidget( this );
     connect( matcher, SIGNAL(removeStroke()), pracPw, SLOT(removeStroke()) );
     connect( pracPw, SIGNAL(beginStroke()),
              this, SLOT(beginStroke()) );
-    connect( pracPw, SIGNAL(stroke( QIMPenStroke * )),
-             this, SLOT(strokeEntered( QIMPenStroke * )) );
+    connect( pracPw, SIGNAL(stroke(QIMPenStroke*)),
+             this, SLOT(strokeEntered(QIMPenStroke*)) );
     connect( pracPw, SIGNAL(beginStroke()),
              matcher, SLOT(beginStroke()) );
-    connect( pracPw, SIGNAL(stroke( QIMPenStroke * )),
-             matcher, SLOT(strokeEntered( QIMPenStroke * )) );
+    connect( pracPw, SIGNAL(stroke(QIMPenStroke*)),
+             matcher, SLOT(strokeEntered(QIMPenStroke*)) );
     gl->addWidget( pracPw, 3, 1 );
 
     redrawTimer = new QTimer( this );
     connect( redrawTimer, SIGNAL(timeout()), this, SLOT(redrawChar()) );
     redrawTimer->start( 5000 );
 
     currentSet = 0;
     charSetCombo->setCurrentItem( 1 );
     selectCharSet( 1 );
 }
 
 HandwritingTrainer::~HandwritingTrainer()
 {
 }
 
 void HandwritingTrainer::showEvent( QShowEvent * )
diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp
index db33c9b..d073cdf 100644
--- a/inputmethods/handwriting/qimpeninput.cpp
+++ b/inputmethods/handwriting/qimpeninput.cpp
@@ -136,36 +136,36 @@ static char * help_xpm[] = {
 */
 QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags wf )
     : QFrame( parent, name, wf ), helpDlg(0), profile(0)
 {
     setFrameStyle( Box | Plain );
 
     profileList.setAutoDelete( true );
 
     matcher = new QIMPenMatch( this );
     connect( matcher, SIGNAL(keypress(uint)), this, SLOT(keypress(uint)) );
     connect( matcher, SIGNAL(erase()), this, SLOT(erase()) );
 
     QGridLayout *gl = new QGridLayout( this, 5, 2, 1, 0 );
     gl->setColStretch( 0, 1 );
 
     wordPicker = new QIMPenWordPick( this );
-    connect( wordPicker, SIGNAL(wordClicked(const QString &)),
-             this, SLOT(wordPicked(const QString &)) );
-    connect( matcher, SIGNAL(matchedCharacters(const QIMPenCharMatchList &)),
-             this, SLOT(matchedCharacters(const QIMPenCharMatchList &)) );
+    connect( wordPicker, SIGNAL(wordClicked(const QString&)),
+             this, SLOT(wordPicked(const QString&)) );
+    connect( matcher, SIGNAL(matchedCharacters(const QIMPenCharMatchList&)),
+             this, SLOT(matchedCharacters(const QIMPenCharMatchList&)) );
     connect( matcher, SIGNAL(matchedWords(const QIMPenMatch::MatchWordList&)),
              wordPicker, SLOT(setWords(const QIMPenMatch::MatchWordList&)) );
     QFont f("smallsmooth",9);
     QFontInfo fi( f );
     wordPicker->setFont( f );
     wordPicker->setBackgroundColor( white );
     gl->addMultiCellWidget( wordPicker, 0, 0, 0, 1 );
     if ( !Global::fixedDawg().root() || !matcher->isWordMatchingEnabled() )
         wordPicker->hide();
 
     pw = new QIMPenWidget( this );
     gl->addMultiCellWidget( pw, 1, 4, 0, 0 );
 
     int bh = pw->sizeHint().height()/4;
 
     QPushButton *b = new QPushButton( this );
@@ -187,42 +187,42 @@ QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags wf )
     helpBtn = new QPushButton( this );
     helpBtn->setFocusPolicy( NoFocus );
     helpBtn->setPixmap( QPixmap( (const char **)help_xpm ) );
     helpBtn->setFixedHeight(bh);
     gl->addWidget( helpBtn, 3, 1 );
     connect( helpBtn, SIGNAL(clicked()), SLOT(help()));
 
     QPixmap pm( (const char **)pen_xpm );
     setupBtn = new QPushButton( this );
     setupBtn->setFocusPolicy( NoFocus );
     setupBtn->setPixmap( pm );
     setupBtn->setFixedHeight(bh);
     gl->addWidget( setupBtn, 4, 1 );
     connect( setupBtn, SIGNAL(clicked()), SLOT(setup()));
 
     connect( matcher, SIGNAL(removeStroke()), pw, SLOT(removeStroke()) );
-    connect( pw, SIGNAL(changeCharSet( QIMPenCharSet * )),
-             matcher, SLOT(setCharSet( QIMPenCharSet * )) );
-    connect( pw, SIGNAL(changeCharSet( int )),
-             this, SLOT(selectCharSet( int )) );
+    connect( pw, SIGNAL(changeCharSet(QIMPenCharSet*)),
+             matcher, SLOT(setCharSet(QIMPenCharSet*)) );
+    connect( pw, SIGNAL(changeCharSet(int)),
+             this, SLOT(selectCharSet(int)) );
     connect( pw, SIGNAL(beginStroke()),
              matcher, SLOT(beginStroke()) );
-    connect( pw, SIGNAL(stroke( QIMPenStroke * )),
-             this, SLOT(strokeEntered( QIMPenStroke * )) );
-    connect( pw, SIGNAL(stroke( QIMPenStroke * )),
-             matcher, SLOT(strokeEntered( QIMPenStroke * )) );
+    connect( pw, SIGNAL(stroke(QIMPenStroke*)),
+             this, SLOT(strokeEntered(QIMPenStroke*)) );
+    connect( pw, SIGNAL(stroke(QIMPenStroke*)),
+             matcher, SLOT(strokeEntered(QIMPenStroke*)) );
 
     shortcutCharSet = 0;
     currCharSet = 0;
     setupDlg = 0;
     profile = 0;
     mode = Normal;
 
     loadProfiles();
 }
 
 QIMPenInput::~QIMPenInput()
 {
     delete (HandwritingHelp*) helpDlg;
 }
 
 QSize QIMPenInput::sizeHint() const
diff --git a/inputmethods/handwriting/qimpensetup.cpp b/inputmethods/handwriting/qimpensetup.cpp
index d0f9ffd..d1297a9 100644
--- a/inputmethods/handwriting/qimpensetup.cpp
+++ b/inputmethods/handwriting/qimpensetup.cpp
@@ -88,34 +88,34 @@ static const char * const right_xpm[] = {
 QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent,
                 const char *name, bool modal, int WFlags )
     : QDialog( parent, name, modal, WFlags ), profileCombo(0), profile(p)
 {
     setCaption( tr("Setup Handwriting Input") );
 
     QVBoxLayout *vb = new QVBoxLayout( this );
 
 #define MULTIPROFILE
 #ifdef MULTIPROFILE
     profileList.setAutoDelete( true );
     QHBoxLayout *hb = new QHBoxLayout( vb );
     hb->setMargin( 6 );
     QLabel *l = new QLabel( tr("Character Profile:"), this );
     hb->addWidget( l );
     profileCombo = new QComboBox( this );
-    connect( profileCombo, SIGNAL(activated(const QString &)),
-             this, SLOT(selectProfile(const QString &)) );
+    connect( profileCombo, SIGNAL(activated(const QString&)),
+             this, SLOT(selectProfile(const QString&)) );
     hb->addWidget( profileCombo );
 #else
     profileList.append( profile );
 #endif
 
     qWarning("profiles: %d", profileList.count());
     
     QTabWidget *tw = new QTabWidget( this );
     vb->addWidget( tw );
 
     pref = new QIMPenPrefBase( this );
     tw->addTab( pref, tr("Preferences") );
 
     pref->inputStyle->setExclusive( TRUE );
 
     style = profile->style() == QIMPenProfile::ToggleCases ? 1 : 0;
@@ -234,34 +234,34 @@ QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name,
         bool modal, int WFlags)
     : QDialog( parent, name, modal, WFlags )
 {
     setCaption( tr("Enter new character") );
     uni = 0;
 
     QVBoxLayout *vb = new QVBoxLayout( this, 10 );
 
     QHBoxLayout *hb = new QHBoxLayout();
     vb->addLayout( hb );
 
     QLabel *label = new QLabel( tr("Character:"), this );
     hb->addWidget( label );
 
     QComboBox *cb = new QComboBox( TRUE, this );
     connect( cb, SIGNAL(activated(int)), SLOT(setSpecial(int)) );
-    connect( cb, SIGNAL(textChanged(const QString &)),
-            SLOT(setCharacter(const QString &)) );
+    connect( cb, SIGNAL(textChanged(const QString&)),
+            SLOT(setCharacter(const QString&)) );
     addSpecial( cb );
     cb->setEditText( "" );
     hb->addWidget( cb );
 
     hb = new QHBoxLayout();
     vb->addLayout( hb );
 
     QPushButton *pb = new QPushButton( "OK", this );
     connect( pb, SIGNAL(clicked()), SLOT(accept()));
     hb->addWidget( pb );
     pb = new QPushButton( "Cancel", this );
     connect( pb, SIGNAL(clicked()), SLOT(reject()));
     hb->addWidget( pb );
 
     cb->setFocus();
 }
@@ -327,34 +327,34 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
     charSetCombo = new QComboBox( this );
     gl->addMultiCellWidget( charSetCombo, 0, 0, 0, 1 );
     connect( charSetCombo, SIGNAL(activated(int)), SLOT(selectCharSet(int)));
     QIMPenCharSetIterator it( profile->charSets() );
     for ( ; it.current(); ++it ) {
         charSetCombo->insertItem( it.current()->description() );
     }
 
     charList = new QListBox( this );
     charList->setMinimumHeight( charList->sizeHint().height() );
     connect( charList, SIGNAL(highlighted(int)), SLOT(selectChar(int)) );
     gl->addWidget( charList, 1, 0 );
 
     pw = new QIMPenWidget( this );
     pw->setFixedHeight( 75 );
     gl->addMultiCellWidget( pw, 2, 3, 0, 0 );
-    connect( pw, SIGNAL(stroke(QIMPenStroke *)),
-                 SLOT(newStroke(QIMPenStroke *)) );
+    connect( pw, SIGNAL(stroke(QIMPenStroke*)),
+                 SLOT(newStroke(QIMPenStroke*)) );
 
     QVBoxLayout *vb = new QVBoxLayout();
     gl->addLayout( vb, 1, 1 );
     newBtn = new QPushButton( tr("New..."), this );
     connect( newBtn, SIGNAL(clicked()), SLOT(addNewChar()) );
     vb->addWidget( newBtn );
 
     addBtn = new QPushButton( tr("Add"), this );
     connect( addBtn, SIGNAL(clicked()), SLOT(addChar()) );
     vb->addWidget( addBtn );
 
     removeBtn = new QPushButton( tr("Remove"), this );
     connect( removeBtn, SIGNAL(clicked()), SLOT(removeChar()) );
     vb->addWidget( removeBtn );
 
     QPushButton *pb = new QPushButton( tr("Default"), this );
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index aec0ad3..4f4f25f 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -82,34 +82,34 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     picks->initialise();
     if (usePicks) {
 
         QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
 
     } else picks->hide();
 
     loadKeyboardColors();
 
     keys = new Keys();
 
     repeatTimer = new QTimer( this );
     connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
 
     QCopChannel* kbdChannel = new QCopChannel("MultiKey/Keyboard", this);
-    connect(kbdChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-            this, SLOT(receive(const QCString &, const QByteArray &)));
+    connect(kbdChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+            this, SLOT(receive(const QCString&,const QByteArray&)));
 }
 
 Keyboard::~Keyboard() {
 
     if ( configdlg ) { 
         delete configdlg;
         configdlg = 0;
     }
 
 }
 
 /* Keyboard::resizeEvent {{{1 */
 void Keyboard::resizeEvent(QResizeEvent*)
 {
     int ph = picks->sizeHint().height();
     picks->setGeometry( 0, 0, width(), ph );