113 files changed, 536 insertions, 531 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 7625545..e8072c6 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -54,4 +54,4 @@ CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
     connect( pcmciaChannel,
-             SIGNAL( received( const QCString &, const QByteArray & ) ), this,
-             SLOT( cardMessage( const QCString &, const QByteArray & ) ) );
+             SIGNAL( received(const QCString&,const QByteArray&) ), this,
+             SLOT( cardMessage(const QCString&,const QByteArray&) ) );
 
@@ -59,4 +59,4 @@ CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
     connect( sdChannel,
-             SIGNAL( received( const QCString &, const QByteArray & ) ), this,
-             SLOT( cardMessage( const QCString &, const QByteArray & ) ) );
+             SIGNAL( received(const QCString&,const QByteArray&) ), this,
+             SLOT( cardMessage(const QCString&,const QByteArray&) ) );
 
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 34d151e..4fc8076 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -48,5 +48,5 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget(
 
-        connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( )));
-        connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
-        connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( )));
+        connect ( QApplication::clipboard ( ), SIGNAL( dataChanged()), this, SLOT( newData()));
+        connect ( m_timer, SIGNAL( timeout()), this, SLOT( newData()));
+        connect ( qApp, SIGNAL( aboutToQuit()), this, SLOT( shutdown()));
 
@@ -101,3 +101,3 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *)
 
-                connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int )));
+                connect ( m_menu, SIGNAL( activated(int)), this, SLOT( action(int)));
 
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index 9fead03..120a019 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -32,5 +32,5 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
     //setFont( QFont( "Helvetica", , QFont::Normal ) );
-    connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime( ) ) );
-    connect( qApp, SIGNAL( clockChanged( bool ) ),
-       this, SLOT( slotClockChanged( bool ) ) );
+    connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime() ) );
+    connect( qApp, SIGNAL( clockChanged(bool) ),
+       this, SLOT( slotClockChanged(bool) ) );
     readConfig();
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index afc0592..dde8050 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -62,3 +62,3 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
         connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
-                this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) );
+                this, SLOT(slotMessage(const QCString&,const QByteArray&) ) );
 }
@@ -99,3 +99,3 @@ void IrdaApplet::popup ( QString message, QString icon )
 
-        QTimer::singleShot ( 2000, this, SLOT( popupTimeout ( )));
+        QTimer::singleShot ( 2000, this, SLOT( popupTimeout()));
 }
diff --git a/core/applets/multikeyapplet/multikey.cpp b/core/applets/multikeyapplet/multikey.cpp
index b17498d..fc5f093 100644
--- a/core/applets/multikeyapplet/multikey.cpp
+++ b/core/applets/multikeyapplet/multikey.cpp
@@ -26,4 +26,4 @@ Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("
     QCopChannel* swChannel = new QCopChannel("MultiKey/Switcher", this);
-    connect( swChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-             this, SLOT(message(const QCString &, const QByteArray &)));
+    connect( swChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(message(const QCString&,const QByteArray&)));
 
diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index dcbf809..0488c36 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -50,4 +50,4 @@ RotateApplet::RotateApplet()
     QCopChannel *rotateChannel = new QCopChannel( "QPE/Rotation" , this );
-    connect ( rotateChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
-              this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
+    connect ( rotateChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
+              this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
 #endif
diff --git a/core/applets/screenshotapplet/screenshot.cpp b/core/applets/screenshotapplet/screenshot.cpp
index 5d6bce4..20e1c9b 100644
--- a/core/applets/screenshotapplet/screenshot.cpp
+++ b/core/applets/screenshotapplet/screenshot.cpp
@@ -301,5 +301,5 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
   
-  connect ( grabTimer, SIGNAL( timeout ( )), this, SLOT( performGrab ( )));
-  connect ( grabItButton, SIGNAL( clicked ( )), SLOT( slotGrab ( )));
-  connect ( scapButton, SIGNAL( clicked ( )), SLOT( slotScap ( )));
+  connect ( grabTimer, SIGNAL( timeout()), this, SLOT( performGrab()));
+  connect ( grabItButton, SIGNAL( clicked()), SLOT( slotGrab()));
+  connect ( scapButton, SIGNAL( clicked()), SLOT( slotScap()));
 }
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index 563d110..27f6015 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -215,4 +215,4 @@ VMemo::VMemo( QWidget *parent, const char *_name )
     myChannel = new QCopChannel( "QPE/VMemo", this );
-    connect( myChannel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(receive(const QCString&, const QByteArray&)) );
+    connect( myChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(receive(const QCString&,const QByteArray&)) );
 
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index 8fd88f6..942cebb 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -410,23 +410,23 @@ VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *pa
   rateTimer = new QTimer( this );
-  connect ( rateTimer, SIGNAL( timeout ( )), this, SLOT( rateTimerDone ( )));
+  connect ( rateTimer, SIGNAL( timeout()), this, SLOT( rateTimerDone()));
 
-  connect ( upButton,   SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
-  connect ( upButton,   SIGNAL( released ( )), this, SLOT( buttonChanged ( )));
-  connect ( downButton, SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
-  connect ( downButton, SIGNAL( released ( )), this, SLOT( buttonChanged ( )));
+  connect ( upButton,   SIGNAL( pressed()),  this, SLOT( buttonChanged()));
+  connect ( upButton,   SIGNAL( released()), this, SLOT( buttonChanged()));
+  connect ( downButton, SIGNAL( pressed()),  this, SLOT( buttonChanged()));
+  connect ( downButton, SIGNAL( released()), this, SLOT( buttonChanged()));
 
-  connect ( micSlider, SIGNAL( valueChanged ( int )), this, SLOT( micMoved( int )));
-  connect ( volSlider, SIGNAL( valueChanged ( int )), this, SLOT( volMoved( int )));
-  connect ( alarmSlider, SIGNAL( valueChanged ( int )), this, SLOT( alarmMoved( int )));
-  connect ( bassSlider, SIGNAL( valueChanged ( int )), this, SLOT( bassMoved( int )));
-  connect ( trebleSlider, SIGNAL( valueChanged ( int )), this, SLOT( trebleMoved( int )));
+  connect ( micSlider, SIGNAL( valueChanged(int)), this, SLOT( micMoved(int)));
+  connect ( volSlider, SIGNAL( valueChanged(int)), this, SLOT( volMoved(int)));
+  connect ( alarmSlider, SIGNAL( valueChanged(int)), this, SLOT( alarmMoved(int)));
+  connect ( bassSlider, SIGNAL( valueChanged(int)), this, SLOT( bassMoved(int)));
+  connect ( trebleSlider, SIGNAL( valueChanged(int)), this, SLOT( trebleMoved(int)));
 
 
-  connect ( volLed,   SIGNAL( toggled ( bool )), this, SLOT( volMuteToggled ( bool )));
-  connect ( micLed,   SIGNAL( toggled ( bool )), this, SLOT( micMuteToggled ( bool )));
-  connect ( alarmLed, SIGNAL( toggled ( bool )), this, SLOT( alarmSoundToggled ( bool )));
+  connect ( volLed,   SIGNAL( toggled(bool)), this, SLOT( volMuteToggled(bool)));
+  connect ( micLed,   SIGNAL( toggled(bool)), this, SLOT( micMuteToggled(bool)));
+  connect ( alarmLed, SIGNAL( toggled(bool)), this, SLOT( alarmSoundToggled(bool)));
 
-  connect ( alarmBox, SIGNAL( toggled ( bool )), this, SLOT( alarmSoundToggled ( bool )));
-  connect ( keyBox,   SIGNAL( toggled ( bool )), this, SLOT( keyClickToggled ( bool )));
-  connect ( tapBox,   SIGNAL( toggled ( bool )), this, SLOT( screenTapToggled ( bool )));
+  connect ( alarmBox, SIGNAL( toggled(bool)), this, SLOT( alarmSoundToggled(bool)));
+  connect ( keyBox,   SIGNAL( toggled(bool)), this, SLOT( keyClickToggled(bool)));
+  connect ( tapBox,   SIGNAL( toggled(bool)), this, SLOT( screenTapToggled(bool)));
 
@@ -726,4 +726,4 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
 
-  connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool )));
-  connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool )));
+  connect ( qApp, SIGNAL( volumeChanged(bool)), m_dialog, SLOT( volumeChanged(bool)));
+  connect ( qApp, SIGNAL( micChanged(bool)), m_dialog, SLOT ( micChanged(bool)));
 }
diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp
index c0066d8..6587b26 100644
--- a/core/apps/embeddedkonsole/commandeditdialog.cpp
+++ b/core/apps/embeddedkonsole/commandeditdialog.cpp
@@ -53,3 +53,3 @@ CommandEditDialog::CommandEditDialog(QWidget *parent, const char* name, WFlags f
 
-  connect( m_SuggestedCommandList, SIGNAL( clicked( QListViewItem * ) ), m_PlayListSelection, SLOT( addToSelection( QListViewItem *) ) );
+  connect( m_SuggestedCommandList, SIGNAL( clicked(QListViewItem*) ), m_PlayListSelection, SLOT( addToSelection(QListViewItem*) ) );
 
diff --git a/core/apps/embeddedkonsole/session.cpp b/core/apps/embeddedkonsole/session.cpp
index 043b8db..a94712a 100644
--- a/core/apps/embeddedkonsole/session.cpp
+++ b/core/apps/embeddedkonsole/session.cpp
@@ -53,4 +53,4 @@ TESession::TESession(QMainWindow* main, TEWidget* _te, const char* _pgm, QStrLis
 
-  QObject::connect( em,SIGNAL(changeTitle(int, const QString&)),
-                    this,SLOT(changeTitle(int, const QString&)) );
+  QObject::connect( em,SIGNAL(changeTitle(int,const QString&)),
+                    this,SLOT(changeTitle(int,const QString&)) );
 
@@ -74,4 +74,4 @@ TESession::~TESession()
 {
- QObject::disconnect( sh, SIGNAL( done( int ) ),
-                      this, SLOT( done( int ) ) );
+ QObject::disconnect( sh, SIGNAL( done(int) ),
+                      this, SLOT( done(int) ) );
   delete em;
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp
index 8fb0161..336d9fb 100644
--- a/core/apps/helpbrowser/helpbrowser.cpp
+++ b/core/apps/helpbrowser/helpbrowser.cpp
@@ -72,4 +72,4 @@ void HelpBrowser::init( const QString& _home )
     connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) );
-    connect( browser, SIGNAL( backwardAvailable( bool ) ),
-             backAction, SLOT( setEnabled( bool ) ) );
+    connect( browser, SIGNAL( backwardAvailable(bool) ),
+             backAction, SLOT( setEnabled(bool) ) );
     backAction->addTo( go );
@@ -80,4 +80,4 @@ void HelpBrowser::init( const QString& _home )
     connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) );
-    connect( browser, SIGNAL( forwardAvailable( bool ) ),
-             forwardAction, SLOT( setEnabled( bool ) ) );
+    connect( browser, SIGNAL( forwardAvailable(bool) ),
+             forwardAction, SLOT( setEnabled(bool) ) );
     forwardAction->addTo( go );
@@ -95,4 +95,4 @@ void HelpBrowser::init( const QString& _home )
     bookm->insertSeparator();
-    connect( bookm, SIGNAL( activated( int ) ),
-             this, SLOT( bookmChosen( int ) ) );
+    connect( bookm, SIGNAL( activated(int) ),
+             this, SLOT( bookmChosen(int) ) );
 
@@ -109,8 +109,8 @@ void HelpBrowser::init( const QString& _home )
         QCopChannel *addressChannel = new QCopChannel("QPE/HelpBrowser" , this );
-        connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
-                 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
+        connect (addressChannel, SIGNAL( received(const QCString&,const QByteArray&)),
+                 this, SLOT ( appMessage(const QCString&,const QByteArray&) ) );
 #endif
 
-    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
-             this, SLOT(appMessage(const QCString&, const QByteArray&)) );
+    connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
+             this, SLOT(appMessage(const QCString&,const QByteArray&)) );
 }
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 55725cc..b54da34 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -165,4 +165,4 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     channel = new QCopChannel( "QPE/Application/textedit", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-        this, SLOT(receive(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+        this, SLOT(receive(const QCString&,const QByteArray&)) );
 
@@ -327,3 +327,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     searchBar->setStretchableWidget( searchEdit );
-    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
+    connect( searchEdit, SIGNAL( textChanged(const QString&) ),
        this, SLOT( search() ) );
@@ -585,4 +585,4 @@ void TextEdit::slotFind() {
     FindDialog frmFind( tr("Text Editor"), this );
-    connect( &frmFind, SIGNAL(signalFindClicked(const QString &, bool, bool, int)),
-       editor, SLOT(slotDoFind( const QString&,bool,bool)));
+    connect( &frmFind, SIGNAL(signalFindClicked(const QString&,bool,bool,int)),
+       editor, SLOT(slotDoFind(const QString&,bool,bool)));
 
diff --git a/core/launcher/appicons.cpp b/core/launcher/appicons.cpp
index c51ee5a..4d48b24 100644
--- a/core/launcher/appicons.cpp
+++ b/core/launcher/appicons.cpp
@@ -1,5 +1,5 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
@@ -23,3 +23,5 @@
 
-#include <qpe/qcopenvelope_qws.h>
+#ifdef QWS
+#include <qtopia/qcopenvelope_qws.h>
+#endif
 
@@ -36,4 +38,4 @@ AppIcons::AppIcons( QWidget *parent ) :
     QCopChannel* channel = new QCopChannel("Qt/Tray", this);
-    connect(channel, SIGNAL(received(const QCString&, const QByteArray&)),
-            this, SLOT(receive(const QCString&, const QByteArray&)));
+    connect(channel, SIGNAL(received(const QCString&,const QByteArray&)),
+            this, SLOT(receive(const QCString&,const QByteArray&)));
 #endif
@@ -70,3 +72,3 @@ QLabel* AppIcons::button(int id)
         buttons.insert(id,f=new FlatButton(this));
-        connect(f,SIGNAL(clicked(const QPoint&, int, bool)),this,SLOT(clicked(const QPoint&, int, bool)));
+        connect(f,SIGNAL(clicked(const QPoint&,int,bool)),this,SLOT(clicked(const QPoint&,int,bool)));
         f->show();
diff --git a/core/launcher/applauncher.cpp b/core/launcher/applauncher.cpp
index 7d3c032..08a3cb4 100644
--- a/core/launcher/applauncher.cpp
+++ b/core/launcher/applauncher.cpp
@@ -88,8 +88,8 @@ AppLauncher::AppLauncher(QObject *parent, const char *name)
     QCopChannel* channel = new QCopChannel( "QPE/System", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(received(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(received(const QCString&,const QByteArray&)) );
 
     channel = new QCopChannel( "QPE/Server", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(received(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(received(const QCString&,const QByteArray&)) );
 
diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index 50ae6c2..4316648 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -100,4 +100,4 @@ FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
     appLauncher = new AppLauncher( this );
-    connect( appLauncher, SIGNAL(terminated(int, const QString&)),
-            this, SLOT(terminated(int, const QString&)) );
+    connect( appLauncher, SIGNAL(terminated(int,const QString&)),
+            this, SLOT(terminated(int,const QString&)) );
 
@@ -159,4 +159,4 @@ FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
     QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
-    connect(sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-            this, SLOT(message(const QCString &, const QByteArray &)) );
+    connect(sysChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+            this, SLOT(message(const QCString&,const QByteArray&)) );
 #endif
diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index 683f1e2..19e799a 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -147,4 +147,4 @@ InputMethods::InputMethods( QWidget *parent ) :
     QCopChannel *channel = new QCopChannel( "QPE/IME", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(qcopReceive(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(qcopReceive(const QCString&,const QByteArray&)) );
 }
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 54efb0b..5d0c778 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -100,6 +100,6 @@ LauncherTabWidget::LauncherTabWidget( Launcher* parent ) :
     QCopChannel *channel = new QCopChannel( "QPE/Launcher", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(launcherMessage(const QCString&, const QByteArray&)) );
-    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
-             this, SLOT(appMessage(const QCString&, const QByteArray&)));
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(launcherMessage(const QCString&,const QByteArray&)) );
+    connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
+             this, SLOT(appMessage(const QCString&,const QByteArray&)));
 #endif
@@ -479,4 +479,4 @@ void Launcher::createGUI()
     QCopChannel* sysChannel = new QCopChannel( "QPE/System", this );
-    connect( sysChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-             this, SLOT(systemMessage( const QCString &, const QByteArray &)) );
+    connect( sysChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(systemMessage(const QCString&,const QByteArray&)) );
 #endif
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 513b1bd..6c7d487 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -617,10 +617,10 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
 
-    connect( icons, SIGNAL(mouseButtonClicked(int, QIconViewItem *, const QPoint&)),
-                   SLOT(itemClicked(int, QIconViewItem *)) );
+    connect( icons, SIGNAL(mouseButtonClicked(int,QIconViewItem*,const QPoint&)),
+                   SLOT(itemClicked(int,QIconViewItem*)) );
     connect( icons, SIGNAL(selectionChanged()),
                    SLOT(selectionChanged()) );
-    connect( icons, SIGNAL(returnPressed(QIconViewItem *)),
-                   SLOT(returnPressed(QIconViewItem *)) );
-    connect( icons, SIGNAL(mouseButtonPressed(int, QIconViewItem *, const QPoint&)),
-                   SLOT(itemPressed(int, QIconViewItem *)) );
+    connect( icons, SIGNAL(returnPressed(QIconViewItem*)),
+                   SLOT(returnPressed(QIconViewItem*)) );
+    connect( icons, SIGNAL(mouseButtonPressed(int,QIconViewItem*,const QPoint&)),
+                   SLOT(itemPressed(int,QIconViewItem*)) );
 
diff --git a/core/launcher/packageslave.cpp b/core/launcher/packageslave.cpp
index 321b5dd..7e61b0e 100644
--- a/core/launcher/packageslave.cpp
+++ b/core/launcher/packageslave.cpp
@@ -54,4 +54,4 @@ PackageHandler::PackageHandler( QObject *parent, char* name )
     packageChannel = new QCopChannel( "QPE/Package", this );
-    connect( packageChannel, SIGNAL( received(const QCString &, const QByteArray &) ),
-             this, SLOT( qcopMessage( const QCString &, const QByteArray &) ) );
+    connect( packageChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
+             this, SLOT( qcopMessage(const QCString&,const QByteArray&) ) );
 #endif
diff --git a/core/launcher/qcopbridge.cpp b/core/launcher/qcopbridge.cpp
index 24f471d..53efba4 100644
--- a/core/launcher/qcopbridge.cpp
+++ b/core/launcher/qcopbridge.cpp
@@ -67,7 +67,7 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
         desktopChannel = new QCopChannel( "QPE/Desktop", this );
-        connect( desktopChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-                 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
+        connect( desktopChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                 this, SLOT(desktopMessage(const QCString&,const QByteArray&)) );
         cardChannel = new QCopChannel( "QPE/Card", this );
-        connect( cardChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-                 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
+        connect( cardChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                 this, SLOT(desktopMessage(const QCString&,const QByteArray&)) );
 #endif
@@ -94,3 +94,3 @@ void QCopBridge::authorizeConnections()
         if ( !it.current()->verifyAuthorised() ) {
-            disconnect ( it.current(), SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( closed( QCopBridgePI *) ) );
+            disconnect ( it.current(), SIGNAL( connectionClosed(QCopBridgePI*) ), this, SLOT( closed(QCopBridgePI*) ) );
             openConnections.removeRef( it.current() );
@@ -105,3 +105,3 @@ void QCopBridge::newConnection( int socket )
     openConnections.append( pi );
-    connect ( pi, SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( closed( QCopBridgePI *) ) );
+    connect ( pi, SIGNAL( connectionClosed(QCopBridgePI*) ), this, SLOT( closed(QCopBridgePI*) ) );
 
diff --git a/core/launcher/runningappbar.cpp b/core/launcher/runningappbar.cpp
index 11d10dc..2e9d2a9 100644
--- a/core/launcher/runningappbar.cpp
+++ b/core/launcher/runningappbar.cpp
@@ -36,4 +36,4 @@ RunningAppBar::RunningAppBar(QWidget* parent)
     QCopChannel* channel = new QCopChannel( "QPE/System", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-             this, SLOT(received(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+             this, SLOT(received(const QCString&,const QByteArray&)) );
 
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index 068d716..ea0b792 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -149,5 +149,5 @@ Server::Server() :
     appLauncher = new AppLauncher(this);
-    connect(appLauncher, SIGNAL(launched(int, const QString &)), this, SLOT(applicationLaunched(int, const QString &)) );
-    connect(appLauncher, SIGNAL(terminated(int, const QString &)), this, SLOT(applicationTerminated(int, const QString &)) );
-    connect(appLauncher, SIGNAL(connected(const QString &)), this, SLOT(applicationConnected(const QString &)) );
+    connect(appLauncher, SIGNAL(launched(int,const QString&)), this, SLOT(applicationLaunched(int,const QString&)) );
+    connect(appLauncher, SIGNAL(terminated(int,const QString&)), this, SLOT(applicationTerminated(int,const QString&)) );
+    connect(appLauncher, SIGNAL(connected(const QString&)), this, SLOT(applicationConnected(const QString&)) );
 
@@ -167,8 +167,8 @@ Server::Server() :
     QCopChannel *channel = new QCopChannel("QPE/System", this);
-    connect(channel, SIGNAL(received(const QCString &, const QByteArray &)),
-            this, SLOT(systemMsg(const QCString &, const QByteArray &)) );
+    connect(channel, SIGNAL(received(const QCString&,const QByteArray&)),
+            this, SLOT(systemMsg(const QCString&,const QByteArray&)) );
 
     QCopChannel *tbChannel = new QCopChannel( "QPE/TaskBar", this );
-    connect( tbChannel, SIGNAL(received(const QCString&, const QByteArray&)),
-            this, SLOT(receiveTaskBar(const QCString&, const QByteArray&)) );
+    connect( tbChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+            this, SLOT(receiveTaskBar(const QCString&,const QByteArray&)) );
 
@@ -615,4 +615,4 @@ void Server::startTransferServer()
             // ... OK
-            connect( qcopBridge, SIGNAL(connectionClosed(const QHostAddress &)),
-                    this, SLOT(syncConnectionClosed(const QHostAddress &)) );
+            connect( qcopBridge, SIGNAL(connectionClosed(const QHostAddress&)),
+                    this, SLOT(syncConnectionClosed(const QHostAddress&)) );
         } else {
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index f7c2341..d38dd97 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -303,8 +303,8 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
-    connect(channel, SIGNAL(received( const QCString&, const QByteArray& ) ),
-            this, SLOT(systemMessage(const QCString&, const QByteArray& ) ) );
+    connect(channel, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT(systemMessage(const QCString&,const QByteArray&) ) );
 
     channel = new QCopChannel("QPE/Launcher", this );
-    connect(channel, SIGNAL(received( const QCString&, const QByteArray& ) ),
-            this, SLOT(launcherMessage( const QCString&, const QByteArray& ) ) );
+    connect(channel, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT(launcherMessage(const QCString&,const QByteArray&) ) );
 
@@ -314,3 +314,3 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
 
-    connect( qApp, SIGNAL( volumeChanged( bool ) ),
+    connect( qApp, SIGNAL( volumeChanged(bool) ),
              this, SLOT( rereadVolumes() ) );
diff --git a/core/launcher/shutdownimpl.cpp b/core/launcher/shutdownimpl.cpp
index f43a2a3..2731568 100644
--- a/core/launcher/shutdownimpl.cpp
+++ b/core/launcher/shutdownimpl.cpp
@@ -108,6 +108,6 @@ ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl )
         m_timer = new QTimer ( this );
-        connect ( m_timer, SIGNAL( timeout ( ) ), this, SLOT( timeout ( ) ) );
+        connect ( m_timer, SIGNAL( timeout() ), this, SLOT( timeout() ) );
 
-        connect ( btngrp, SIGNAL( clicked ( int ) ), this, SLOT( buttonClicked ( int ) ) );
-        connect ( cancel, SIGNAL( clicked ( ) ), this, SLOT( cancelClicked ( ) ) );
+        connect ( btngrp, SIGNAL( clicked(int) ), this, SLOT( buttonClicked(int) ) );
+        connect ( cancel, SIGNAL( clicked() ), this, SLOT( cancelClicked() ) );
 
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 491a8a3..91e2f20 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -215,4 +215,4 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
     QCopChannel *channel = new QCopChannel( "QPE/TaskBar", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-        this, SLOT(receive(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+        this, SLOT(receive(const QCString&,const QByteArray&)) );
 #endif
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index b998e95..a5e20b2 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -75,3 +75,3 @@ void TransferServer::authorizeConnections()
         if ( !it.current()->verifyAuthorised() ) {
-            disconnect( it.current(), SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
+            disconnect( it.current(), SIGNAL(connectionClosed(ServerPI*)), this, SLOT( closed(ServerPI*)) );
             connections.removeRef( it.current() );
@@ -94,3 +94,3 @@ void TransferServer::newConnection( int socket )
     ServerPI *ptr = new ServerPI( socket, this );
-    connect( ptr, SIGNAL(connectionClosed(ServerPI *)), this, SLOT( closed(ServerPI *)) );
+    connect( ptr, SIGNAL(connectionClosed(ServerPI*)), this, SLOT( closed(ServerPI*)) );
     connections.append( ptr );
@@ -335,3 +335,3 @@ ServerPI::ServerPI( int socket, QObject *parent, const char* name )
         connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
-        connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
+        connect( dtp, SIGNAL( error(int) ), SLOT( dtpError(int) ) );
 
@@ -346,4 +346,4 @@ ServerPI::ServerPI( int socket, QObject *parent, const char* name )
         }
-        connect( serversocket, SIGNAL( newIncomming( int ) ),
-                 SLOT( newConnection( int ) ) );
+        connect( serversocket, SIGNAL( newIncomming(int) ),
+                 SLOT( newConnection(int) ) );
     }
@@ -1088,3 +1088,3 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
   connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
-  connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) );
+  connect( this, SIGNAL( bytesWritten(int) ), SLOT( bytesWritten(int) ) );
   connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) );
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index 82242a3..4ed5921 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -443,4 +443,4 @@ bool LoopControl::init( const QString& filename ) {
 
-    connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( setPosition( long ) ) );
-    connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( setPaused( bool ) ) );
+    connect( mediaPlayerState, SIGNAL( positionChanged(long) ), this, SLOT( setPosition(long) ) );
+    connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) );
 
diff --git a/core/multimedia/opieplayer/loopcontrol_threaded.cpp b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
index 3796549..0a1fc17 100644
--- a/core/multimedia/opieplayer/loopcontrol_threaded.cpp
+++ b/core/multimedia/opieplayer/loopcontrol_threaded.cpp
@@ -583,4 +583,4 @@ bool LoopControl::init( const QString& filename ) {
 
-    connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( setPosition( long ) ) );
-    connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( setPaused( bool ) ) );
+    connect( mediaPlayerState, SIGNAL( positionChanged(long) ), this, SLOT( setPosition(long) ) );
+    connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) );
 
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index b77708c..6c743ec 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -44,4 +44,4 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
 
-    connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
-    connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
+    connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
+    connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( pauseCheck(bool) ) );
     connect( mediaPlayerState, SIGNAL( next() ),     this, SLOT( next() ) );
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index a359843..efb5df3 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -121,4 +121,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     channel = new QCopChannel( "QPE/Application/opieplayer", this );
-    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
-        this, SLOT( qcopReceive(const QCString&, const QByteArray&)) );
+    connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
+        this, SLOT( qcopReceive(const QCString&,const QByteArray&)) );
 
@@ -152,3 +152,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
                                           this , SLOT(removeSelected()) );
-//    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE );
+//    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool)/*btnPlay()*/), TRUE );
     d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play",
@@ -186,4 +186,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     skinsMenu->isCheckable();
-    connect( skinsMenu, SIGNAL( activated( int ) ) ,
-             this, SLOT( skinsMenuActivated( int ) ) );
+    connect( skinsMenu, SIGNAL( activated(int) ) ,
+             this, SLOT( skinsMenuActivated(int) ) );
     populateSkinsMenu();
@@ -298,4 +298,4 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
-    connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-             this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
+    connect( d->selectedFiles, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
+             this,SLOT( playlistViewPressed(int,QListViewItem*,const QPoint&,int)) );
 
@@ -303,8 +303,8 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 ///audioView
-    connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-             this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
+    connect( audioView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
+             this,SLOT( viewPressed(int,QListViewItem*,const QPoint&,int)) );
     
-    connect( audioView, SIGNAL( returnPressed( QListViewItem *)),
-             this,SLOT( playIt( QListViewItem *)) );
-    connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
+    connect( audioView, SIGNAL( returnPressed(QListViewItem*)),
+             this,SLOT( playIt(QListViewItem*)) );
+    connect( audioView, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( addToSelection(QListViewItem*) ) );
 
@@ -312,10 +312,10 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 //videoView
-    connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-             this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
-    connect( videoView, SIGNAL( returnPressed( QListViewItem *)),
-             this,SLOT( playIt( QListViewItem *)) );
-    connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
+    connect( videoView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int)),
+             this,SLOT( viewPressed(int,QListViewItem*,const QPoint&,int)) );
+    connect( videoView, SIGNAL( returnPressed(QListViewItem*)),
+             this,SLOT( playIt(QListViewItem*)) );
+    connect( videoView, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( addToSelection(QListViewItem*) ) );
 
 //playlists
-    connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
+    connect( playLists, SIGNAL( fileSelected(const DocLnk&) ), this, SLOT( loadList(const DocLnk&) ) );
 
@@ -323,9 +323,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
-    connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ),    d->tbPlay,    SLOT( setOn( bool ) ) );
+    connect( mediaPlayerState, SIGNAL( playingToggled(bool) ),    d->tbPlay,    SLOT( setOn(bool) ) );
 
-    connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ),    d->tbLoop,    SLOT( setOn( bool ) ) );
-    connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),   d->tbShuffle, SLOT( setOn( bool ) ) );
-    connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ),   this,         SLOT( setPlaylist( bool ) ) );
+    connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ),    d->tbLoop,    SLOT( setOn(bool) ) );
+    connect( mediaPlayerState, SIGNAL( shuffledToggled(bool) ),   d->tbShuffle, SLOT( setOn(bool) ) );
+    connect( mediaPlayerState, SIGNAL( playlistToggled(bool) ),   this,         SLOT( setPlaylist(bool) ) );
 
-    connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
+    connect( d->selectedFiles, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( playIt(QListViewItem*) ) );
 
@@ -942,3 +942,3 @@ void PlayListWidget::listDelete() {
       //                   LnkProperties prop( &lnk);
-      // //  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
+      // //  connect(&prop, SIGNAL(select(const AppLnk*)), this, SLOT(externalSelected(const AppLnk*)));
       //                   prop.showMaximized();
diff --git a/core/obex/obexhandler.cpp b/core/obex/obexhandler.cpp
index 4034560..28f9b5b 100644
--- a/core/obex/obexhandler.cpp
+++ b/core/obex/obexhandler.cpp
@@ -17,4 +17,4 @@ ObexHandler::ObexHandler() {
     QCopChannel* chan = new QCopChannel("QPE/Obex");
-    connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT(irdaMessage(const QCString&, const QByteArray& ) ) );
+    connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT(irdaMessage(const QCString&,const QByteArray&) ) );
 }
diff --git a/core/obex/obexsend.cpp b/core/obex/obexsend.cpp
index 6b8d467..cd8d58e 100644
--- a/core/obex/obexsend.cpp
+++ b/core/obex/obexsend.cpp
@@ -28,12 +28,12 @@ void SendWidget::initUI() {
             this, SLOT(slotIrSent(bool) ) );
-    connect(m_obex, SIGNAL(currentTry(unsigned int ) ),
-            this, SLOT(slotIrTry(unsigned int ) ) );
+    connect(m_obex, SIGNAL(currentTry(unsigned int) ),
+            this, SLOT(slotIrTry(unsigned int) ) );
 
     QCopChannel* chan = new QCopChannel("QPE/IrDaAppletBack", this );
-    connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT(dispatchIrda(const QCString&, const QByteArray& ) ) );
+    connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT(dispatchIrda(const QCString&,const QByteArray&) ) );
 
     chan = new QCopChannel("QPE/BluetoothBack", this );
-    connect(chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT(dispatchBt(const QCString&, const QByteArray& ) ) );
+    connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT(dispatchBt(const QCString&,const QByteArray&) ) );
 
@@ -60,4 +60,4 @@ void SendWidget::initUI() {
     lay->addWidget( m_devBox, 50 );
-    connect(m_devBox, SIGNAL(selectedDevice(int, int ) ),
-            this, SLOT(slotSelectedDevice(int, int) ) );
+    connect(m_devBox, SIGNAL(selectedDevice(int,int) ),
+            this, SLOT(slotSelectedDevice(int,int) ) );
 
diff --git a/core/obex/receiver.cpp b/core/obex/receiver.cpp
index 7d9f7ec..ee2668b 100644
--- a/core/obex/receiver.cpp
+++ b/core/obex/receiver.cpp
@@ -26,4 +26,4 @@ Receiver::Receiver() {
     m_obex = new Obex(this, "Receiver");
-    connect(m_obex, SIGNAL(receivedFile(const QString& ) ),
-            this, SLOT(slotReceived(const QString& ) ) );
+    connect(m_obex, SIGNAL(receivedFile(const QString&) ),
+            this, SLOT(slotReceived(const QString&) ) );
     m_obex->receive();
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 3037ba3..e1b9360 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -59,4 +59,4 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
         QPopupMenu *pop = new QPopupMenu ( this );
-        pop-> insertItem ( tr( "Restart" ), this, SLOT( restart ( )));
-        pop-> insertItem ( tr( "Quit" ), this, SLOT( quit ( )));
+        pop-> insertItem ( tr( "Restart" ), this, SLOT( restart()));
+        pop-> insertItem ( tr( "Quit" ), this, SLOT( quit()));
         m_menu-> setPopup ( pop );
@@ -64,3 +64,3 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
         QCopChannel *channel = new QCopChannel ( "QPE/TaskBar", this );
-                connect ( channel, SIGNAL( received ( const QCString &, const QByteArray & )), this, SLOT( receive ( const QCString &, const QByteArray & )));         
+                connect ( channel, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( receive(const QCString&,const QByteArray&)));         
 
@@ -68,3 +68,3 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
         m_input = new InputMethods ( m_taskbar );
-         connect ( m_input, SIGNAL( inputToggled ( bool )), this, SLOT( calcMaxWindowRect ( )));
+         connect ( m_input, SIGNAL( inputToggled(bool)), this, SLOT( calcMaxWindowRect()));
         lay-> addWidget ( m_input );
@@ -79,3 +79,3 @@ LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_C
                 if (ODevice::inst ( )-> series ( ) != Model_Zaurus){
-                QTimer::singleShot ( 0, this, SLOT( showIM ( )));
+                QTimer::singleShot ( 0, this, SLOT( showIM()));
                 }
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 7d5792e..8d0976f 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -173,3 +173,3 @@ int main ( int argc, char **argv )
                                 l-> show ( );
-                                QTimer::singleShot ( 3000, app, SLOT( quit ( )));
+                                QTimer::singleShot ( 3000, app, SLOT( quit()));
                                 app-> exec ( );
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index f7bff58..29f4383 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -129,3 +129,3 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
         setSorting( TRUE );
-        connect( this, SIGNAL(clicked(int,int,int,const QPoint &)),
+        connect( this, SIGNAL(clicked(int,int,int,const QPoint&)),
                  this, SLOT(itemClicked(int,int)) );
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 670cdb0..8d61582 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -79,6 +79,6 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         // Connect views to me
-        connect ( m_abTable, SIGNAL( signalSwitch( void ) ),
-                  this, SLOT( slotSwitch( void ) ) );
-        connect ( m_ablabel, SIGNAL( signalOkPressed( void ) ),
-                  this, SLOT( slotSwitch( void ) ) );
+        connect ( m_abTable, SIGNAL( signalSwitch(void) ),
+                  this, SLOT( slotSwitch(void) ) );
+        connect ( m_ablabel, SIGNAL( signalOkPressed(void) ),
+                  this, SLOT( slotSwitch(void) ) );
 
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 9cf55b3..8a5f9d5 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -137,4 +137,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
-        connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
-                 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
+        connect (addressChannel, SIGNAL( received(const QCString&,const QByteArray&)),
+                 this, SLOT ( appMessage(const QCString&,const QByteArray&) ) );
 #endif
@@ -158,4 +158,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         searchBar->setStretchableWidget( searchEdit );
-        connect( searchEdit, SIGNAL( returnPressed( ) ),
-                 this, SLOT( slotFind( ) ) );
+        connect( searchEdit, SIGNAL( returnPressed() ),
+                 this, SLOT( slotFind() ) );
 
@@ -228,4 +228,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         // abList->setHScrollBarMode( QScrollView::AlwaysOff );
-        connect( m_abView, SIGNAL( signalViewSwitched ( int ) ),
-                 this, SLOT( slotViewSwitched( int ) ) );
+        connect( m_abView, SIGNAL( signalViewSwitched(int) ),
+                 this, SLOT( slotViewSwitched(int) ) );
 
@@ -256,4 +256,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
-        connect( qApp, SIGNAL( appMessage(const QCString &, const QByteArray &) ),
-        this, SLOT( appMessage(const QCString &, const QByteArray &) ) );
+        connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
+        this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 
@@ -597,3 +597,3 @@ void AddressbookWindow::slotBeam()
         Ir *ir = new Ir( this );
-        connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
+        connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
         QString description = c.fullName();
@@ -675,3 +675,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 Ir *ir = new Ir( this );
-                connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
+                connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
                 QString description = "mycard.vcf";
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index b1eb042..8acf570 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -537,4 +537,4 @@ void ContactEditor::init() {
 
-        connect( birthdayPicker, SIGNAL( dateClicked( int, int, int ) ),
-                 this, SLOT( slotBirthdayDateChanged( int, int, int ) ) );
+        connect( birthdayPicker, SIGNAL( dateClicked(int,int,int) ),
+                 this, SLOT( slotBirthdayDateChanged(int,int,int) ) );
         connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveBirthday() ) );
@@ -561,4 +561,4 @@ void ContactEditor::init() {
 
-        connect( anniversaryPicker, SIGNAL( dateClicked( int, int, int ) ),
-                 this, SLOT( slotAnniversaryDateChanged( int, int, int ) ) );
+        connect( anniversaryPicker, SIGNAL( dateClicked(int,int,int) ),
+                 this, SLOT( slotAnniversaryDateChanged(int,int,int) ) );
         connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveAnniversary() ) );
@@ -646,28 +646,28 @@ void ContactEditor::init() {
 
-        connect( txtFullName, SIGNAL(textChanged(const QString &)), 
-                 this, SLOT(slotFullNameChange(const QString &)) );
-        connect( txtSuffix, SIGNAL(textChanged(const QString &)), 
-                 this, SLOT(slotSuffixChange(const QString &)) );
-         connect( txtOrganization, SIGNAL(textChanged(const QString &)), 
-                 this, SLOT(slotOrganizationChange(const QString &)) );
-        connect( txtChooserField1, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotChooser1Change(const QString &)) );
-        connect( txtChooserField2, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotChooser2Change(const QString &)) );
-        connect( txtChooserField3, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotChooser3Change(const QString &)) );
-        connect( txtChooserField4, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotChooser4Change(const QString &)) );
-        connect( txtAddress, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotAddressChange(const QString &)) );
-        connect( txtCity, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotCityChange(const QString &)) );
-        connect( txtState, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotStateChange(const QString &)) );
-        connect( txtZip, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotZipChange(const QString &)) );
-        connect( cmbCountry, SIGNAL(textChanged(const QString &)),
-                 this, SLOT(slotCountryChange(const QString &)) );
-        connect( cmbCountry, SIGNAL(activated(const QString &)),
-                 this, SLOT(slotCountryChange(const QString &)) );
+        connect( txtFullName, SIGNAL(textChanged(const QString&)), 
+                 this, SLOT(slotFullNameChange(const QString&)) );
+        connect( txtSuffix, SIGNAL(textChanged(const QString&)), 
+                 this, SLOT(slotSuffixChange(const QString&)) );
+         connect( txtOrganization, SIGNAL(textChanged(const QString&)), 
+                 this, SLOT(slotOrganizationChange(const QString&)) );
+        connect( txtChooserField1, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotChooser1Change(const QString&)) );
+        connect( txtChooserField2, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotChooser2Change(const QString&)) );
+        connect( txtChooserField3, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotChooser3Change(const QString&)) );
+        connect( txtChooserField4, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotChooser4Change(const QString&)) );
+        connect( txtAddress, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotAddressChange(const QString&)) );
+        connect( txtCity, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotCityChange(const QString&)) );
+        connect( txtState, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotStateChange(const QString&)) );
+        connect( txtZip, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotZipChange(const QString&)) );
+        connect( cmbCountry, SIGNAL(textChanged(const QString&)),
+                 this, SLOT(slotCountryChange(const QString&)) );
+        connect( cmbCountry, SIGNAL(activated(const QString&)),
+                 this, SLOT(slotCountryChange(const QString&)) );
         connect( cmbChooserField1, SIGNAL(activated(int)),
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index af26302..3934411 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -163,3 +163,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
-        connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), this, SLOT(appMessage(const QCString&, const QByteArray&)) );
+        connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), this, SLOT(appMessage(const QCString&,const QByteArray&)) );
 #endif
@@ -170,5 +170,5 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
         QCopChannel *channel = new QCopChannel( "QPE/System", this );
-        connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
+        connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
         channel = new QCopChannel( "QPE/Datebook", this );
-        connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
+        connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
 #endif
@@ -519,7 +519,7 @@ void DateBook::initDay()
                         connect( dayView, SIGNAL( newEvent() ), this, SLOT( fileNew() ) );
-                connect( dayView, SIGNAL( removeEvent( const Event & ) ), this, SLOT( removeEvent( const Event & ) ) );
-                connect( dayView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) );
-                connect( dayView, SIGNAL( duplicateEvent( const Event & ) ), this, SLOT( duplicateEvent( const Event & ) ) );
-                connect( dayView, SIGNAL( beamEvent( const Event & ) ), this, SLOT( beamEvent( const Event & ) ) );
-                connect( dayView, SIGNAL(sigNewEvent(const QString &)), this, SLOT(slotNewEventFromKey(const QString &)) );
+                connect( dayView, SIGNAL( removeEvent(const Event&) ), this, SLOT( removeEvent(const Event&) ) );
+                connect( dayView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) );
+                connect( dayView, SIGNAL( duplicateEvent(const Event&) ), this, SLOT( duplicateEvent(const Event&) ) );
+                connect( dayView, SIGNAL( beamEvent(const Event&) ), this, SLOT( beamEvent(const Event&) ) );
+                connect( dayView, SIGNAL(sigNewEvent(const QString&)), this, SLOT(slotNewEventFromKey(const QString&)) );
         }
@@ -533,3 +533,3 @@ void DateBook::initWeek()
                 views->addWidget( weekView, WEEK );
-                connect( weekView, SIGNAL( showDate( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) );
+                connect( weekView, SIGNAL( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
                 connect( this, SIGNAL( newEvent() ), weekView, SLOT( redraw() ) );
@@ -558,7 +558,7 @@ void DateBook::initWeekLst() {
                 //weekLstView->setStartViewTime( startTime );
-                connect( weekLstView, SIGNAL( showDate( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) );
-                connect( weekLstView, SIGNAL( addEvent( const QDateTime &, const QDateTime &, const QString & , const QString &) ),
-                        this, SLOT( slotNewEntry( const QDateTime &, const QDateTime &, const QString & , const QString &) ) );
+                connect( weekLstView, SIGNAL( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
+                connect( weekLstView, SIGNAL( addEvent(const QDateTime&,const QDateTime&,const QString&, const QString&) ),
+                        this, SLOT( slotNewEntry(const QDateTime&,const QDateTime&,const QString&, const QString&) ) );
                 connect( this, SIGNAL( newEvent() ), weekLstView, SLOT( redraw() ) );
-                connect( weekLstView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) );
+                connect( weekLstView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) );
         }
@@ -572,3 +572,3 @@ void DateBook::initMonth()
                 views->addWidget( monthView, MONTH );
-                connect( monthView, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( showDay( int, int, int ) ) );
+                connect( monthView, SIGNAL( dateClicked(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
                 connect( this, SIGNAL( newEvent() ), monthView, SLOT( redraw() ) );
@@ -907,3 +907,3 @@ void DateBook::beamEvent( const Event &e )
     Ir *ir = new Ir( this );
-    connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
+    connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
     QString description = e.description();
@@ -926,7 +926,5 @@ void DateBook::slotFind()
     QObject::connect( &frmFind,
-                      SIGNAL(signalFindClicked(const QString&, const QDate&,
-                                               bool, bool, int)),
+                      SIGNAL(signalFindClicked(const QString&,const QDate&,bool,bool,int)),
                       this,
-                      SLOT(slotDoFind(const QString&, const QDate&,
-                                      bool, bool, int)) );
+                      SLOT(slotDoFind(const QString&,const QDate&,bool,bool,int)) );
     QObject::connect( this,
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index 751a1da..ca63dc5 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -210,3 +210,3 @@ void DateBookDayViewQuickLineEdit::slotReturnPressed()
                 quickEvent.setDescription(this->text());
-                connect(this,SIGNAL(insertEvent(const Event &)),this->topLevelWidget(),SLOT(insertEvent(const Event &)));
+                connect(this,SIGNAL(insertEvent(const Event&)),this->topLevelWidget(),SLOT(insertEvent(const Event&)));
                 emit(insertEvent(quickEvent));
@@ -240,7 +240,7 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, QWid
 
-        connect( header, SIGNAL( dateChanged( int, int, int ) ), this, SLOT( dateChanged( int, int, int ) ) );
-        connect( header, SIGNAL( dateChanged( int, int, int ) ), view, SLOT( slotDateChanged( int, int, int ) ) );
+        connect( header, SIGNAL( dateChanged(int,int,int) ), this, SLOT( dateChanged(int,int,int) ) );
+        connect( header, SIGNAL( dateChanged(int,int,int) ), view, SLOT( slotDateChanged(int,int,int) ) );
         connect( view, SIGNAL( sigColWidthChanged() ), this, SLOT( slotColWidthChanged() ) );
         connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) );
-        connect( view, SIGNAL(sigCapturedKey(const QString &)), this, SIGNAL(sigNewEvent(const QString&)) );
+        connect( view, SIGNAL(sigCapturedKey(const QString&)), this, SIGNAL(sigNewEvent(const QString&)) );
 
@@ -375,6 +375,6 @@ void DateBookDay::getEvents()
 
-                    connect( object, SIGNAL( deleteMe( const Event & ) ), this, SIGNAL( removeEvent( const Event & ) ) );
-                    connect( object, SIGNAL( duplicateMe( const Event & ) ), this, SIGNAL( duplicateEvent( const Event & ) ) );
-                    connect( object, SIGNAL( editMe( const Event & ) ), this, SIGNAL( editEvent( const Event & ) ) );
-                    connect( object, SIGNAL( beamMe( const Event & ) ), this, SIGNAL( beamEvent( const Event & ) ) );
+                    connect( object, SIGNAL( deleteMe(const Event&) ), this, SIGNAL( removeEvent(const Event&) ) );
+                    connect( object, SIGNAL( duplicateMe(const Event&) ), this, SIGNAL( duplicateEvent(const Event&) ) );
+                    connect( object, SIGNAL( editMe(const Event&) ), this, SIGNAL( editEvent(const Event&) ) );
+                    connect( object, SIGNAL( beamMe(const Event&) ), this, SIGNAL( beamEvent(const Event&) ) );
 
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index d43d31a..a0aefd3 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -62,3 +62,3 @@ DatebookAlldayDisp* DatebookdayAllday::addEvent(const EffectiveEvent&ev)
 
-    connect(lb,SIGNAL(displayMe(const Event &)),lblDesc,SLOT(disp_event(const Event&)));
+    connect(lb,SIGNAL(displayMe(const Event&)),lblDesc,SLOT(disp_event(const Event&)));
     ++item_count;
diff --git a/core/pim/datebook/datebookdayheaderimpl.cpp b/core/pim/datebook/datebookdayheaderimpl.cpp
index 213c843..51b78ca 100644
--- a/core/pim/datebook/datebookdayheaderimpl.cpp
+++ b/core/pim/datebook/datebookdayheaderimpl.cpp
@@ -98,4 +98,4 @@ void DateBookDayHeader::pickDate()
         m1->insertItem( picker );
-        connect( picker, SIGNAL( dateClicked( int, int, int ) ),
-                 this, SLOT( setDate( int, int, int ) ) );
+        connect( picker, SIGNAL( dateClicked(int,int,int) ),
+                 this, SLOT( setDate(int,int,int) ) );
         connect( m1, SIGNAL( aboutToHide() ),
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index a6d04ba..cb4b73b 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -33,3 +33,3 @@ DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent,
         init();
-        QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) );
+        QObject::connect( qApp, SIGNAL( clockChanged(bool) ), this, SLOT( slotChangeClock(bool) ) );
         QArray<int> categories;
diff --git a/core/pim/datebook/datebookweek.cpp b/core/pim/datebook/datebookweek.cpp
index 933e191..7503751 100644
--- a/core/pim/datebook/datebookweek.cpp
+++ b/core/pim/datebook/datebookweek.cpp
@@ -364,6 +364,6 @@ DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB,
 
-        connect( view, SIGNAL( showDay( int ) ), this, SLOT( showDay( int ) ) );
+        connect( view, SIGNAL( showDay(int) ), this, SLOT( showDay(int) ) );
         connect( view, SIGNAL(signalShowEvent(const EffectiveEvent&)), this, SLOT(slotShowEvent(const EffectiveEvent&)) );
         connect( view, SIGNAL(signalHideEvent()), this, SLOT(slotHideEvent()) );
-        connect( header, SIGNAL( dateChanged( QDate &) ), this, SLOT( dateChanged( QDate &) ) );
+        connect( header, SIGNAL( dateChanged(QDate&) ), this, SLOT( dateChanged(QDate&) ) );
         connect( tHide, SIGNAL( timeout() ), lblDesc, SLOT( hide() ) );
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index eaa9730..c237b2d 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -58,3 +58,3 @@ void DateBookWeekHeader::pickDate()
                 m1->insertItem( picker );
-                connect( picker, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( setDate( int, int, int ) ) );
+                connect( picker, SIGNAL( dateClicked(int,int,int) ), this, SLOT( setDate(int,int,int) ) );
         //      connect( m1, SIGNAL( aboutToHide() ), this, SLOT( gotHide() ) );
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 42a1753..af40143 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -74,3 +74,3 @@ void DateBookWeekLstHeader::pickDate() {
                 m1->insertItem( picker );
-                connect( picker, SIGNAL( dateClicked( int, int, int ) ),this, SLOT( setDate( int, int, int ) ) );
+                connect( picker, SIGNAL( dateClicked(int,int,int) ),this, SLOT( setDate(int,int,int) ) );
                 //connect( m1, SIGNAL( aboutToHide() ),
@@ -237,4 +237,4 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
                 connect(hdr, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-                connect(hdr, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
-                        this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+                connect(hdr, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
+                        this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
                 layout->addWidget(hdr);
@@ -246,3 +246,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
                                 layout->addWidget(l);
-                                connect (l, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+                                connect (l, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
                         }
@@ -267,6 +267,6 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
         layout->addWidget(w);
-        connect (w, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+        connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
         connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-        connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &,const QString &)),
-                this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+        connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
+                this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 
@@ -275,6 +275,6 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
         layout->addWidget(w);
-        connect (w, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+        connect (w, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
         connect (w, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-        connect (w, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
-                this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+        connect (w, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
+                this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 }
@@ -296,3 +296,3 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
         layout->addWidget( header );
-        connect(header, SIGNAL(dateChanged(QDate &)), this, SLOT(dateChanged(QDate &)));
+        connect(header, SIGNAL(dateChanged(QDate&)), this, SLOT(dateChanged(QDate&)));
         connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
@@ -360,6 +360,6 @@ void DateBookWeekLst::getEvents() {
 
-        connect (view, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
+        connect (view, SIGNAL(editEvent(const Event&)), this, SIGNAL(editEvent(const Event&)));
         connect (view, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
-        connect (view, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
-                this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
+        connect (view, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)),
+                this, SIGNAL(addEvent(const QDateTime&,const QDateTime&,const QString&,const QString&)));
 
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 018bb5a..57bcd89 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -192,10 +192,10 @@ void DateEntry::init()
     buttonStart->setPopup( m1 );
-    connect( startPicker, SIGNAL( dateClicked( int, int, int ) ),
-             this, SLOT( startDateChanged( int, int, int ) ) );
+    connect( startPicker, SIGNAL( dateClicked(int,int,int) ),
+             this, SLOT( startDateChanged(int,int,int) ) );
 
     //Let start button change both start and end dates
-    connect( startPicker, SIGNAL( dateClicked( int, int, int ) ),
-             this, SLOT( endDateChanged( int, int, int ) ) );
-    connect( qApp, SIGNAL( clockChanged( bool ) ),
-             this, SLOT( slotChangeClock( bool ) ) );
+    connect( startPicker, SIGNAL( dateClicked(int,int,int) ),
+             this, SLOT( endDateChanged(int,int,int) ) );
+    connect( qApp, SIGNAL( clockChanged(bool) ),
+             this, SLOT( slotChangeClock(bool) ) );
     connect( qApp, SIGNAL(weekChanged(bool)),
@@ -210,7 +210,7 @@ void DateEntry::init()
     buttonEnd->setPopup( m2 );
-    connect( endPicker, SIGNAL( dateClicked( int, int, int ) ),
-             this, SLOT( endDateChanged( int, int, int ) ) );
+    connect( endPicker, SIGNAL( dateClicked(int,int,int) ),
+             this, SLOT( endDateChanged(int,int,int) ) );
 
-    connect(timePickerStart, SIGNAL( timeChanged(const QTime &) ),
-            this, SLOT( startTimePicked(const QTime &) ));
+    connect(timePickerStart, SIGNAL( timeChanged(const QTime&) ),
+            this, SLOT( startTimePicked(const QTime&) ));
     // install eventFilters
diff --git a/core/pim/datebook/repeatentry.cpp b/core/pim/datebook/repeatentry.cpp
index 7cf36da..04c3cf3 100644
--- a/core/pim/datebook/repeatentry.cpp
+++ b/core/pim/datebook/repeatentry.cpp
@@ -361,4 +361,4 @@ void RepeatEntry::init()
 
-    QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)),
-                      this, SLOT(endDateChanged(int, int, int)) );
+    QObject::connect( repeatPicker, SIGNAL(dateClicked(int,int,int)),
+                      this, SLOT(endDateChanged(int,int,int)) );
     QObject::connect( qApp, SIGNAL(weekChanged(bool)),
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 7ff2204..3937796 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -36,8 +36,8 @@ MainWindow::MainWindow()
     QCopChannel* chan = new QCopChannel( "QPE/System", this );
-    connect( chan, SIGNAL( received(const QCString&, const QByteArray& ) ),
-             this, SLOT( slotReceive( const QCString&, const QByteArray& ) ) );
+    connect( chan, SIGNAL( received(const QCString&,const QByteArray&) ),
+             this, SLOT( slotReceive(const QCString&,const QByteArray&) ) );
 
     chan  = new QCopChannel( "QPE/Datebook", this );
-    connect( chan, SIGNAL( received(const QCString&, const QByteArray& ) ),
-             this, SLOT( slotReceive( const QCString&, const QByteArray& ) ) );
+    connect( chan, SIGNAL( received(const QCString&,const QByteArray&) ),
+             this, SLOT( slotReceive(const QCString&,const QByteArray&) ) );
 }
@@ -152,4 +152,4 @@ void MainWindow::initUI() {
 
-    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ),
-             this, SLOT(slotAppMessage( const QCString&, const QByteArray& ) ) );
+    connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ),
+             this, SLOT(slotAppMessage(const QCString&,const QByteArray&) ) );
 }
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index bfe95b0..8b6a5df 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -203,3 +203,3 @@ void MainWindow::makeMenu()
 
-  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) );
+  connect( searchEdit, SIGNAL( textChanged(const QString&) ),this, SLOT( setSearch(const QString&) ) );
   connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index c8652f3..b0d456d 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -39,4 +39,4 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent,  const char*
     
-    connect( m_contactdb, SIGNAL( signalChanged( const OContactAccess * ) ),
-             this, SLOT( refresh( const OContactAccess * ) ) );
+    connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ),
+             this, SLOT( refresh(const OContactAccess*) ) );
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index b6707df..0820802 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -101,3 +101,3 @@ void DatebookPluginWidget::getDates() {
                     l->show();
-                    QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
+                    QObject::connect ( l, SIGNAL( editEvent(const Event&) ), l, SLOT( editEventSlot(const Event&) ) );
                 } else {
@@ -120,3 +120,3 @@ void DatebookPluginWidget::getDates() {
                                 l->show();
-                                QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
+                                QObject::connect ( l, SIGNAL( editEvent(const Event&) ), l, SLOT( editEventSlot(const Event&) ) );
                              }
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp
index 4194270..a8e4c41 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.cpp
+++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp
@@ -42,4 +42,4 @@ MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
     QCopChannel *qCopChannel = new QCopChannel( "QPE/Pim" , this );
-    connect ( qCopChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
-              this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
+    connect ( qCopChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
+              this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
 #endif
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 72cdfd6..812f8b5 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -55,4 +55,4 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
     QCopChannel *todayChannel = new QCopChannel( "QPE/Today" , this );
-    connect ( todayChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
-              this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
+    connect ( todayChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
+              this, SLOT ( channelReceived(const QCString&,const QByteArray&) ) );
 #endif
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp
index 5c51515..a6f53e1 100644
--- a/core/pim/today/todayconfig.cpp
+++ b/core/pim/today/todayconfig.cpp
@@ -87,3 +87,3 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
 
-    connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
+    connect ( m_appletListView , SIGNAL( clicked(QListViewItem*) ), this, SLOT( appletChanged() ) );
 
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index b68aad2..a244e58 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -191,3 +191,3 @@ void MainWindow::initActions() {
     m_showDeadLineAction->setOn( showDeadline() );
-    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) );
+    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine(bool) ) );
 
diff --git a/core/pim/todo/otaskeditor.cpp b/core/pim/todo/otaskeditor.cpp
index ab1ce94..d1e50f7 100644
--- a/core/pim/todo/otaskeditor.cpp
+++ b/core/pim/todo/otaskeditor.cpp
@@ -85,3 +85,3 @@ void OTaskEditor::init() {
     connect(m_stat, SIGNAL(dueDateChanged(const QDate&) ),
-            m_rec, SLOT(setStartDate(const QDate& ) ) );
+            m_rec, SLOT(setStartDate(const QDate&) ) );
 
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp
index 5bbf880..0d298f4 100644
--- a/core/pim/todo/tableview.cpp
+++ b/core/pim/todo/tableview.cpp
@@ -118,10 +118,10 @@ TableView::TableView( MainWindow* window, QWidget* wid )
 
-    connect((QTable*)this, SIGNAL( clicked( int, int, int, const QPoint& ) ),
-            this, SLOT( slotClicked(int, int, int, const QPoint& ) ) );
-    connect((QTable*)this, SIGNAL( pressed( int, int, int, const QPoint& ) ),
-            this, SLOT( slotPressed(int, int, int, const QPoint& ) ) );
-    connect((QTable*)this, SIGNAL(valueChanged(int, int) ),
-            this, SLOT( slotValueChanged(int, int) ) );
-    connect((QTable*)this, SIGNAL(currentChanged(int, int) ),
-            this, SLOT( slotCurrentChanged(int, int) ) );
+    connect((QTable*)this, SIGNAL( clicked(int,int,int,const QPoint&) ),
+            this, SLOT( slotClicked(int,int,int,const QPoint&) ) );
+    connect((QTable*)this, SIGNAL( pressed(int,int,int,const QPoint&) ),
+            this, SLOT( slotPressed(int,int,int,const QPoint&) ) );
+    connect((QTable*)this, SIGNAL(valueChanged(int,int) ),
+            this, SLOT( slotValueChanged(int,int) ) );
+    connect((QTable*)this, SIGNAL(currentChanged(int,int) ),
+            this, SLOT( slotCurrentChanged(int,int) ) );
 
diff --git a/core/pim/todo/taskeditoralarms.cpp b/core/pim/todo/taskeditoralarms.cpp
index 930c94e..a512fb0 100644
--- a/core/pim/todo/taskeditoralarms.cpp
+++ b/core/pim/todo/taskeditoralarms.cpp
@@ -81,4 +81,4 @@ TaskEditorAlarms::TaskEditorAlarms( QWidget* parent,  int, const char* name, WFl
 
-    connect( lstAlarms, SIGNAL(clicked ( QListViewItem *, const QPoint &, int  ) ),
-             this, SLOT(inlineEdit(QListViewItem*, const QPoint&, int  ) ) );
+    connect( lstAlarms, SIGNAL(clicked(QListViewItem*,const QPoint&,int) ),
+             this, SLOT(inlineEdit(QListViewItem*,const QPoint&,int) ) );
 
diff --git a/core/pim/todo/taskeditorstatus.cpp b/core/pim/todo/taskeditorstatus.cpp
index 367dd58..16351e0 100644
--- a/core/pim/todo/taskeditorstatus.cpp
+++ b/core/pim/todo/taskeditorstatus.cpp
@@ -102,4 +102,4 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     btnStart->setPopup( popup );
-    connect( m_startBook, SIGNAL( dateClicked( int, int, int ) ),
-             this, SLOT( slotStartChanged( int, int, int ) ) );
+    connect( m_startBook, SIGNAL( dateClicked(int,int,int) ),
+             this, SLOT( slotStartChanged(int,int,int) ) );
 
@@ -118,4 +118,4 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     btnDue->setPopup( popup );
-    connect( m_dueBook, SIGNAL( dateClicked( int, int, int ) ),
-             this, SLOT( slotDueChanged( int, int, int ) ) );
+    connect( m_dueBook, SIGNAL( dateClicked(int,int,int) ),
+             this, SLOT( slotDueChanged(int,int,int) ) );
 
@@ -134,4 +134,4 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     btnComp->setPopup( popup );
-    connect( m_compBook, SIGNAL( dateClicked( int, int, int ) ),
-             this, SLOT( slotCompChanged( int, int, int ) ) );
+    connect( m_compBook, SIGNAL( dateClicked(int,int,int) ),
+             this, SLOT( slotCompChanged(int,int,int) ) );
 
diff --git a/core/qws/qcopbridge.cpp b/core/qws/qcopbridge.cpp
index c0c52e8..4fd0807 100644
--- a/core/qws/qcopbridge.cpp
+++ b/core/qws/qcopbridge.cpp
@@ -56,7 +56,7 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent ,
         desktopChannel = new QCopChannel( "QPE/Desktop", this );
-        connect( desktopChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-                 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
+        connect( desktopChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                 this, SLOT(desktopMessage(const QCString&,const QByteArray&)) );
         cardChannel = new QCopChannel( "QPE/Card", this );
-        connect( cardChannel, SIGNAL(received(const QCString &, const QByteArray &)),
-                 this, SLOT(desktopMessage( const QCString &, const QByteArray &)) );
+        connect( cardChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                 this, SLOT(desktopMessage(const QCString&,const QByteArray&)) );
 #endif
@@ -77,3 +77,3 @@ void QCopBridge::newConnection( int socket )
     openConnections.append( pi );
-    connect ( pi, SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( connectionClosed( QCopBridgePI *) ) );
+    connect ( pi, SIGNAL( connectionClosed(QCopBridgePI*) ), this, SLOT( connectionClosed(QCopBridgePI*) ) );
 #ifndef QT_NO_COP
diff --git a/core/qws/transferserver.cpp b/core/qws/transferserver.cpp
index 30bf438..daf63ec 100644
--- a/core/qws/transferserver.cpp
+++ b/core/qws/transferserver.cpp
@@ -296,3 +296,3 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name )
                 connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
-                connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
+                connect( dtp, SIGNAL( error(int) ), SLOT( dtpError(int) ) );
 
@@ -307,4 +307,4 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name )
                 }
-                connect( serversocket, SIGNAL( newIncomming( int ) ),
-                         SLOT( newConnection( int ) ) );
+                connect( serversocket, SIGNAL( newIncomming(int) ),
+                         SLOT( newConnection(int) ) );
         }
@@ -1048,3 +1048,3 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
         connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
-        connect( this, SIGNAL( bytesWritten( int ) ), SLOT( bytesWritten( int ) ) );
+        connect( this, SIGNAL( bytesWritten(int) ), SLOT( bytesWritten(int) ) );
         connect( this, SIGNAL( readyRead() ), SLOT( readyRead() ) );
@@ -1055,3 +1055,3 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
         createTargzProc->setWorkingDirectory( QDir::rootDirPath() );
-        connect( createTargzProc, SIGNAL( processExited(OProcess *) ), SLOT( targzDone() ) );
+        connect( createTargzProc, SIGNAL( processExited(OProcess*) ), SLOT( targzDone() ) );
 
@@ -1061,5 +1061,5 @@ ServerDTP::ServerDTP( QObject *parent, const char* name)
         retrieveTargzProc->setWorkingDirectory( QDir::rootDirPath() );
-        connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ),
+        connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ),
                  SIGNAL( completed() ) );
-        connect( retrieveTargzProc, SIGNAL( processExited(OProcess *) ),
+        connect( retrieveTargzProc, SIGNAL( processExited(OProcess*) ),
                  SLOT( extractTarDone() ) );
@@ -1283,4 +1283,4 @@ void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen)
                 mode = Idle;
-                disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int ) ),
-                            this, SLOT( writeTargzBlock(OProcess *, char *, int) ) );
+                disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
+                            this, SLOT( writeTargzBlock(OProcess*,char*,int) ) );
         }
@@ -1291,4 +1291,4 @@ void ServerDTP::targzDone()
         //qDebug("targz done");
-        disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
-                    this, SLOT( gzipTarBlock(OProcess *, char *, int) ) );
+        disconnect( createTargzProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
+                    this, SLOT( gzipTarBlock(OProcess*,char*,int) ) );
         gzipProc->closeStdin();
@@ -1340,3 +1340,3 @@ void ServerDTP::sendGzipFile( const QString &fn,
         connect( createTargzProc,
-                 SIGNAL( receivedStdout(OProcess *, char *, int) ), SLOT( gzipTarBlock(OProcess *, char *, int) ) );
+                 SIGNAL( receivedStdout(OProcess*,char*,int) ), SLOT( gzipTarBlock(OProcess*,char*,int) ) );
 
@@ -1344,4 +1344,4 @@ void ServerDTP::sendGzipFile( const QString &fn,
         *gzipProc << "gzip";
-        connect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
-                 SLOT( writeTargzBlock(OProcess *, char *, int) ) );
+        connect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
+                 SLOT( writeTargzBlock(OProcess*,char*,int) ) );
 }
@@ -1354,4 +1354,4 @@ void ServerDTP::gunzipDone()
         retrieveTargzProc->closeStdin();
-        disconnect( gzipProc, SIGNAL( receivedStdout(OProcess *, char *, int) ),
-                    this, SLOT( tarExtractBlock(OProcess *, char *, int) ) );
+        disconnect( gzipProc, SIGNAL( receivedStdout(OProcess*,char*,int) ),
+                    this, SLOT( tarExtractBlock(OProcess*,char*,int) ) );
 }
diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp
index 141e0f6..d80e496 100644
--- a/core/settings/button/buttonsettings.cpp
+++ b/core/settings/button/buttonsettings.cpp
@@ -138,3 +138,3 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *name,  bool modal
         m_timer = new QTimer ( this );
-        connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( )));
+        connect ( m_timer, SIGNAL( timeout()), this, SLOT( keyTimeout()));
 
diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index 7dabe68..121173a 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -81,3 +81,3 @@ RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, c
   
-  QTimer::singleShot ( 0, this, SLOT( delayedInit ( )));
+  QTimer::singleShot ( 0, this, SLOT( delayedInit()));
 }
diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp
index e7f0c46..721285d 100644
--- a/core/settings/citytime/citytime.cpp
+++ b/core/settings/citytime/citytime.cpp
@@ -111,4 +111,4 @@ CityTime::CityTime( QWidget *parent, const char* name,
     changed = FALSE;
-    QObject::connect( qApp, SIGNAL( clockChanged( bool ) ),
-                      this, SLOT( changeClock( bool ) ) );
+    QObject::connect( qApp, SIGNAL( clockChanged(bool) ),
+                      this, SLOT( changeClock(bool) ) );
     // now start the timer so we can update the time quickly every second
diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp
index a3483cc..323929b 100644
--- a/core/settings/citytime/citytimebase.cpp
+++ b/core/settings/citytime/citytimebase.cpp
@@ -232,3 +232,3 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     // signals and slots connections
-    connect( frmMap, SIGNAL( signalTz(const QString &, const QString &) ), this, SLOT( slotNewTz(const QString &, const QString &) ) );
+    connect( frmMap, SIGNAL( signalTz(const QString&,const QString&) ), this, SLOT( slotNewTz(const QString&,const QString&) ) );
     connect( cmdCity1, SIGNAL( toggled(bool) ), cmdCity2, SLOT( setDisabled(bool) ) );
diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp
index b83da59..b6843d2 100644
--- a/core/settings/citytime/zonemap.cpp
+++ b/core/settings/citytime/zonemap.cpp
@@ -189,8 +189,8 @@ ZoneMap::ZoneMap( QWidget *parent, const char* name )
                       this, SLOT( slotUpdate() ) );
-    QObject::connect( cmdZoom, SIGNAL( toggled( bool ) ),
-                      this, SLOT( slotZoom( bool ) ) );
-    QObject::connect( &norm, SIGNAL( signalNewPoint( const QPoint& ) ),
-                      this, SLOT( slotFindCity( const QPoint& ) ) );
-    QObject::connect( qApp, SIGNAL( clockChanged( bool ) ),
-                      this, SLOT( changeClock( bool ) ) );
+    QObject::connect( cmdZoom, SIGNAL( toggled(bool) ),
+                      this, SLOT( slotZoom(bool) ) );
+    QObject::connect( &norm, SIGNAL( signalNewPoint(const QPoint&) ),
+                      this, SLOT( slotFindCity(const QPoint&) ) );
+    QObject::connect( qApp, SIGNAL( clockChanged(bool) ),
+                      this, SLOT( changeClock(bool) ) );
     // update the sun's movement every 5 minutes
@@ -468,3 +468,3 @@ QWidget* ZoneMap::selectionWidget( QWidget *parent) {
     QWhatsThis::add( continentView, tr("Select a continent/country here, then select a city") );
-    connect ( continentView, SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( slotGetCities(  QListViewItem * ) ) );
+    connect ( continentView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( slotGetCities(QListViewItem*) ) );
 
@@ -504,3 +504,3 @@ void ZoneMap::slotGetCities( QListViewItem * contItem) {
             item = new QListViewItem( cityView, pZone->city() );
-            connect ( cityView, SIGNAL( clicked ( QListViewItem* ) ), this, SLOT( slotCitySelected( QListViewItem* ) ) );
+            connect ( cityView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( slotCitySelected(QListViewItem*) ) );
         }
diff --git a/core/settings/launcher/menusettings.cpp b/core/settings/launcher/menusettings.cpp
index dc8e993..2b64c47 100644
--- a/core/settings/launcher/menusettings.cpp
+++ b/core/settings/launcher/menusettings.cpp
@@ -72,3 +72,3 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
 
-        connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
+        connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged()));
 
@@ -126,3 +126,3 @@ void MenuSettings::init ( )
         m_menusubpopup->setEnabled( m_menutabs->isChecked() );
-        connect( m_menutabs, SIGNAL( stateChanged( int ) ), m_menusubpopup, SLOT( setEnabled( bool ) ) );
+        connect( m_menutabs, SIGNAL( stateChanged(int) ), m_menusubpopup, SLOT( setEnabled(bool) ) );
 
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index f79ad40..c0d1cf2 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -321,5 +321,5 @@ QWidget *TabDialog::createFontTab ( QWidget *parent )
 
-        connect ( m_fontuse, SIGNAL( toggled ( bool )), m_fontselect, SLOT( setEnabled ( bool )));
-    connect( m_fontselect, SIGNAL( fontSelected ( const QFont & )),
-             this, SLOT( fontClicked ( const QFont & )));
+        connect ( m_fontuse, SIGNAL( toggled(bool)), m_fontselect, SLOT( setEnabled(bool)));
+    connect( m_fontselect, SIGNAL( fontSelected(const QFont&)),
+             this, SLOT( fontClicked(const QFont&)));
 
@@ -356,3 +356,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
         m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) );
-        connect ( m_solidcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( bgColorClicked ( const QColor & )));
+        connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&)));
         hb-> addWidget ( m_solidcolor );
@@ -371,3 +371,3 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
         m_imagebrowse = new QPushButton ( tr( "Select..." ), tab );
-        connect ( m_imagebrowse, SIGNAL( clicked ( )), this, SLOT( bgImageClicked ( )));
+        connect ( m_imagebrowse, SIGNAL( clicked()), this, SLOT( bgImageClicked()));
         hb-> addWidget ( m_imagebrowse );
@@ -378,6 +378,6 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
         QPushButton *p = new QPushButton ( tr( "Default" ), tab );
-        connect ( p, SIGNAL( clicked ( )), this, SLOT( bgDefaultClicked ( )));
+        connect ( p, SIGNAL( clicked()), this, SLOT( bgDefaultClicked()));
         gridLayout-> addWidget ( p, 3, 1 );
 
-        connect ( m_bgtype, SIGNAL( clicked ( int )), this, SLOT( bgTypeClicked ( int )));
+        connect ( m_bgtype, SIGNAL( clicked(int)), this, SLOT( bgTypeClicked(int)));
 
@@ -411,3 +411,3 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
 
-        connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int )));
+        connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int)));
 
@@ -422,3 +422,3 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
         m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) );
-        connect ( m_iconcolor, SIGNAL( colorSelected ( const QColor & )), this, SLOT( iconColorClicked ( const QColor & )));
+        connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&)));
         gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft );
diff --git a/core/settings/launcher/tabssettings.cpp b/core/settings/launcher/tabssettings.cpp
index 17a1609..e5a7087 100644
--- a/core/settings/launcher/tabssettings.cpp
+++ b/core/settings/launcher/tabssettings.cpp
@@ -68,3 +68,3 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
         lay-> addWidget ( p1, 1, 1 );
-        connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( )));
+        connect ( p1, SIGNAL( clicked()), this, SLOT( newClicked()));
 
@@ -72,3 +72,3 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
         lay-> addWidget ( p2, 2, 1 );
-        connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( )));
+        connect ( p2, SIGNAL( clicked()), this, SLOT( editClicked()));
 
@@ -76,3 +76,3 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
         lay-> addWidget ( p3, 3, 1 );
-        connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( )));
+        connect ( p3, SIGNAL( clicked()), this, SLOT( deleteClicked()));
 
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index badb98f..43886c9 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -64,3 +64,3 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
 
-        connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
+        connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged()));
 
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 4baff8e..ce45836 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -174,3 +174,3 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
         m_resettimer = new QTimer ( this );
-        connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( )));
+        connect ( m_resettimer, SIGNAL( timeout()), this, SLOT( resetBacklight()));
 
@@ -183,7 +183,7 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 
-        connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
-        connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
+        connect ( brightness, SIGNAL( valueChanged(int)), this, SLOT( setBacklight(int)));
+        connect ( brightness_ac, SIGNAL( valueChanged(int)), this, SLOT( setBacklight(int)));
         if (m_cres) {
-                connect ( contrast,    SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
-                connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
+                connect ( contrast,    SIGNAL( valueChanged(int)), this, SLOT( setContrast(int)));
+                connect ( contrast_ac, SIGNAL( valueChanged(int)), this, SLOT( setContrast(int)));
         }
@@ -202,3 +202,3 @@ void LightSettings::calibrateSensor ( )
         Sensor *s = new Sensor ( m_sensordata, this );
-        connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int )));
+        connect ( s, SIGNAL( viewBacklight(int)), this, SLOT( setBacklight(int)));
         QPEApplication::execDialog( s );
@@ -210,3 +210,3 @@ void LightSettings::calibrateSensorAC ( )
         Sensor *s = new Sensor ( m_sensordata_ac, this );
-        connect ( s, SIGNAL( viewBacklight ( int )), this, SLOT( setBacklight ( int )));
+        connect ( s, SIGNAL( viewBacklight(int)), this, SLOT( setBacklight(int)));
         QPEApplication::execDialog ( s );
diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp
index 41de851..013e655 100644
--- a/core/settings/light-and-power/sensor.cpp
+++ b/core/settings/light-and-power/sensor.cpp
@@ -75,7 +75,7 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
         
-        connect ( interval, SIGNAL( valueChanged ( int )), m_calib, SLOT( setInterval ( int )));
-        connect ( linesteps, SIGNAL( valueChanged ( int )), m_calib, SLOT( setLineSteps ( int )));
+        connect ( interval, SIGNAL( valueChanged(int)), m_calib, SLOT( setInterval(int)));
+        connect ( linesteps, SIGNAL( valueChanged(int)), m_calib, SLOT( setLineSteps(int)));
         
-        connect ( m_calib, SIGNAL( startPointChanged ( const QPoint & )), this, SLOT( pointDrag ( const QPoint & )));
-        connect ( m_calib, SIGNAL( endPointChanged ( const QPoint & )), this, SLOT( pointDrag ( const QPoint & )));
+        connect ( m_calib, SIGNAL( startPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&)));
+        connect ( m_calib, SIGNAL( endPointChanged(const QPoint&)), this, SLOT( pointDrag(const QPoint&)));
 }                
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index cc411fd..1d6774c 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -88,4 +88,4 @@ public:
         qlChannel = new QCopChannel( ch, this);
-        connect( qlChannel, SIGNAL(received(const QCString&, const QByteArray&)),
-                 this, SLOT(message(const QCString&, const QByteArray&)) );
+        connect( qlChannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                 this, SLOT(message(const QCString&,const QByteArray&)) );
     }
diff --git a/development/keyview/keyview.cpp b/development/keyview/keyview.cpp
index 21bbb93..93c84d9 100644
--- a/development/keyview/keyview.cpp
+++ b/development/keyview/keyview.cpp
@@ -43,4 +43,4 @@ Keyview::Keyview( QWidget* parent,  const char* name, WFlags fl )
 
-    connect(filter, SIGNAL(keyPressed(int, int, int, bool, bool)), 
-                           this, SLOT(updateItems(int, int, int, bool, bool)));
+    connect(filter, SIGNAL(keyPressed(int,int,int,bool,bool)), 
+                           this, SLOT(updateItems(int,int,int,bool,bool)));
 }
diff --git a/examples/main-tab/simple.cpp b/examples/main-tab/simple.cpp
index 69dd00f..c5a6d5a 100644
--- a/examples/main-tab/simple.cpp
+++ b/examples/main-tab/simple.cpp
@@ -42,3 +42,3 @@ MainWindow::MainWindow(QWidget *parent,  const char* name, WFlags fl )
     connect(tab, SIGNAL(currentChanged(QWidget*) ),
-            this, SLOT( slotCurrentChanged( QWidget* ) ) );
+            this, SLOT( slotCurrentChanged(QWidget*) ) );
     setCentralWidget( tab );
diff --git a/examples/simple-pim/simple.cpp b/examples/simple-pim/simple.cpp
index 3e9fcd3..029e71b 100644
--- a/examples/simple-pim/simple.cpp
+++ b/examples/simple-pim/simple.cpp
@@ -81,6 +81,6 @@ MainWindow::MainWindow(QWidget *parent,  const char* name, WFlags fl )
      */
-    connect(m_todoView, SIGNAL(showRecord(const OPimRecord& ) ),
-            this, SLOT(slotShowRecord(const OPimRecord& ) ) );
-    connect(m_dateView, SIGNAL(showRecord(const OPimRecord& ) ),
-            this, SLOT(slotShowRecord(const OPimRecord& ) ) );
+    connect(m_todoView, SIGNAL(showRecord(const OPimRecord&) ),
+            this, SLOT(slotShowRecord(const OPimRecord&) ) );
+    connect(m_dateView, SIGNAL(showRecord(const OPimRecord&) ),
+            this, SLOT(slotShowRecord(const OPimRecord&) ) );
 
@@ -191,4 +191,4 @@ void MainWindow::slotLoad() {
     m_desktopChannel = new QCopChannel("QPE/Desktop");
-    connect(m_desktopChannel, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT(slotDesktopReceive(const QCString&, const QByteArray& ) ) );
+    connect(m_desktopChannel, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT(slotDesktopReceive(const QCString&,const QByteArray&) ) );
     /* the numberof synced channels will be set to zero */
@@ -309,4 +309,4 @@ void MainWindow::slotDate() {
     DateBookMonth *month = new DateBookMonth(menu, 0, true );
-    connect(month, SIGNAL(dateClicked(int, int, int) ),
-            this, SLOT(slotLoadForDay(int, int, int) ) );
+    connect(month, SIGNAL(dateClicked(int,int,int) ),
+            this, SLOT(slotLoadForDay(int,int,int) ) );
 
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
@@ -165,4 +165,4 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
     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&)) );
 
@@ -188,8 +188,8 @@ HandwritingTrainer::HandwritingTrainer( QIMPenProfile *p, QWidget *parent, const
              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 );
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
@@ -151,6 +151,6 @@ QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags wf )
     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&)),
@@ -202,12 +202,12 @@ QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags wf )
     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*)) );
 
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
@@ -103,4 +103,4 @@ QIMPenSetup::QIMPenSetup( QIMPenProfile *p, QWidget *parent,
     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 );
@@ -249,4 +249,4 @@ QIMPenInputCharDlg::QIMPenInputCharDlg( QWidget *parent, const char *name,
     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 );
@@ -342,4 +342,4 @@ QIMPenEdit::QIMPenEdit( QIMPenProfile *p, QWidget *parent,
     gl->addMultiCellWidget( pw, 2, 3, 0, 0 );
-    connect( pw, SIGNAL(stroke(QIMPenStroke *)),
-                 SLOT(newStroke(QIMPenStroke *)) );
+    connect( pw, SIGNAL(stroke(QIMPenStroke*)),
+                 SLOT(newStroke(QIMPenStroke*)) );
 
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
@@ -97,4 +97,4 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     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&)));
 }
diff --git a/libopie/big-screen/example/osplitter_mail.cpp b/libopie/big-screen/example/osplitter_mail.cpp
index 4eaf3a9..4356baa 100644
--- a/libopie/big-screen/example/osplitter_mail.cpp
+++ b/libopie/big-screen/example/osplitter_mail.cpp
@@ -30,4 +30,4 @@ ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
     lay->addWidget( m_splitter );
-    connect(m_splitter, SIGNAL(sizeChange(bool, const QSize& ) ),
-            this, SLOT(slotSizeChange(bool, const QSize& ) ) );
+    connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ),
+            this, SLOT(slotSizeChange(bool,const QSize&) ) );
 
diff --git a/libopie/colordialog.cpp b/libopie/colordialog.cpp
index d46da41..b2854a6 100644
--- a/libopie/colordialog.cpp
+++ b/libopie/colordialog.cpp
@@ -474,6 +474,6 @@ QColorShower::QColorShower( QWidget *parent, const char *name )
     gl->addMultiCellWidget(lab, 0,-1,0,0);
-    connect( lab, SIGNAL( colorDropped( QRgb ) ),
-             this, SIGNAL( newCol( QRgb ) ) );
-    connect( lab, SIGNAL( colorDropped( QRgb ) ),
-             this, SLOT( setRgb( QRgb ) ) );
+    connect( lab, SIGNAL( colorDropped(QRgb) ),
+             this, SIGNAL( newCol(QRgb) ) );
+    connect( lab, SIGNAL( colorDropped(QRgb) ),
+             this, SLOT( setRgb(QRgb) ) );
 
diff --git a/libopie/colorpopupmenu.cpp b/libopie/colorpopupmenu.cpp
index 0d66fba..03ad233 100644
--- a/libopie/colorpopupmenu.cpp
+++ b/libopie/colorpopupmenu.cpp
@@ -154,3 +154,3 @@ void OColorPopupMenu::addColor( const QColor& color, int row, int col )
     OColorPanelButton* panelButton = new OColorPanelButton( color, colorPanel );
-    connect( panelButton, SIGNAL( selected( const QColor& ) ), this, SLOT( buttonSelected( const QColor& ) ) );
+    connect( panelButton, SIGNAL( selected(const QColor&) ), this, SLOT( buttonSelected(const QColor&) ) );
     colorLayout->addWidget( panelButton, row, col );
diff --git a/libopie/ocolorbutton.cpp b/libopie/ocolorbutton.cpp
index 93fe5d0..298dba2 100644
--- a/libopie/ocolorbutton.cpp
+++ b/libopie/ocolorbutton.cpp
@@ -55,3 +55,3 @@ OColorButton::OColorButton ( QWidget *parent, const QColor &color, const char *n
         //setPopupDelay ( 0 );
-        connect ( d-> m_menu, SIGNAL( colorSelected ( const QColor & )), this, SLOT( updateColor ( const QColor & )));
+        connect ( d-> m_menu, SIGNAL( colorSelected(const QColor&)), this, SLOT( updateColor(const QColor&)));
 
diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index c0b6efa..4258d60 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -534,3 +534,3 @@ void ODevice::initButtons ( )
         QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-        connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+        connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
@@ -1114,4 +1114,4 @@ void Yopy::initButtons ( )
   QCopChannel *sysch = new QCopChannel("QPE/System", this);
-  connect(sysch, SIGNAL(received(const QCString &, const QByteArray & )),
-          this, SLOT(systemMessage(const QCString &, const QByteArray & )));
+  connect(sysch, SIGNAL(received(const QCString&,const QByteArray&)),
+          this, SLOT(systemMessage(const QCString&,const QByteArray&)));
 }
@@ -1263,3 +1263,3 @@ void iPAQ::initButtons ( )
         QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-        connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+        connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
@@ -1749,4 +1749,4 @@ void Zaurus::initButtons ( )
         QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-        connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )),
-                  this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+        connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)),
+                  this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
@@ -2300,3 +2300,3 @@ void SIMpad::initButtons ( )
         QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-        connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+        connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
@@ -2800,3 +2800,3 @@ void Jornada::initButtons ( )
         QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-        connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+        connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
diff --git a/libopie/ofileselector.cpp b/libopie/ofileselector.cpp
index 1ba94ae..2a6aed0 100644
--- a/libopie/ofileselector.cpp
+++ b/libopie/ofileselector.cpp
@@ -125,3 +125,3 @@ QWidget* ODocumentFileView::widget( QWidget* parent ) {
         m_selector = new FileSelector(currentMimeType().join(";"), parent, "fileselector", showNew(), showClose() );
-        QObject::connect(m_selector, SIGNAL(fileSelected( const DocLnk& ) ),
+        QObject::connect(m_selector, SIGNAL(fileSelected(const DocLnk&) ),
                          selector(), SLOT(slotDocLnkBridge(const DocLnk&) ) );
@@ -129,4 +129,4 @@ QWidget* ODocumentFileView::widget( QWidget* parent ) {
                          selector(), SIGNAL(closeMe() ) );
-        QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk& ) ),
-                         selector(), SIGNAL(newSelected(const DocLnk& ) ) );
+        QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk&) ),
+                         selector(), SIGNAL(newSelected(const DocLnk&) ) );
     }
@@ -390,4 +390,4 @@ void OFileViewFileListView::connectSlots() {
             this, SLOT(slotCurrentChanged(QListViewItem*) ) );
-    connect(m_view, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint&, int ) ),
-            this, SLOT(slotClicked(int, QListViewItem*, const QPoint&, int ) ) );
+    connect(m_view, SIGNAL(mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),
+            this, SLOT(slotClicked(int,QListViewItem*,const QPoint&,int) ) );
 }
@@ -782,4 +782,4 @@ void OFileSelector::initViews() {
     m_cmbView->insertItem( QObject::tr("All Files") );
-    connect(m_cmbView, SIGNAL(activated( const QString& ) ),
-            this, SLOT(slotViewChange( const QString& ) ) );
+    connect(m_cmbView, SIGNAL(activated(const QString&) ),
+            this, SLOT(slotViewChange(const QString&) ) );
 
diff --git a/libopie/ofontselector.cpp b/libopie/ofontselector.cpp
index 7e07008..87b7869 100644
--- a/libopie/ofontselector.cpp
+++ b/libopie/ofontselector.cpp
@@ -121,3 +121,3 @@ OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *na
         gridLayout->addMultiCellWidget( d-> m_font_family_list, 0, 4, 0, 0 );
-        connect( d-> m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) );
+        connect( d-> m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) );
 
@@ -127,3 +127,3 @@ OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *na
         d-> m_font_style_list = new QComboBox( this, "StyleListBox" );
-        connect( d-> m_font_style_list, SIGNAL(  activated( int ) ), this, SLOT( fontStyleClicked( int ) ) );
+        connect( d-> m_font_style_list, SIGNAL(  activated(int) ), this, SLOT( fontStyleClicked(int) ) );
         gridLayout->addWidget( d-> m_font_style_list, 1, 1 );
@@ -134,4 +134,4 @@ OFontSelector::OFontSelector ( bool withpreview, QWidget *parent, const char *na
         d-> m_font_size_list = new QComboBox( this, "SizeListBox" );
-        connect( d-> m_font_size_list, SIGNAL(  activated( int ) ),
-                         this, SLOT( fontSizeClicked( int ) ) );
+        connect( d-> m_font_size_list, SIGNAL(  activated(int) ),
+                         this, SLOT( fontSizeClicked(int) ) );
         gridLayout->addWidget( d-> m_font_size_list, 3, 1 );
diff --git a/libopie/orecurrancewidget.cpp b/libopie/orecurrancewidget.cpp
index d81851e..33be269 100644
--- a/libopie/orecurrancewidget.cpp
+++ b/libopie/orecurrancewidget.cpp
@@ -552,4 +552,4 @@ void ORecurranceWidget::init() {
 
-    QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)),
-                      this, SLOT(endDateChanged(int, int, int)) );
+    QObject::connect( repeatPicker, SIGNAL(dateClicked(int,int,int)),
+                      this, SLOT(endDateChanged(int,int,int)) );
     QObject::connect( qApp, SIGNAL(weekChanged(bool)),
diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index 3a9a5ec..52190b2 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -72,3 +72,3 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
     tabBarStack->addWidget( tabBar, 0 );
-    connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
+    connect( tabBar, SIGNAL( selected(int) ), this, SLOT( slotTabBarSelected(int) ) );
 
@@ -76,3 +76,3 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
     tabBarStack->addWidget( tabList, 1 );
-    connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
+    connect( tabList, SIGNAL( activated(int) ), this, SLOT( slotTabListSelected(int) ) );
 
diff --git a/libopie/otimepicker.cpp b/libopie/otimepicker.cpp
index 1eca7c5..11b80ed 100644
--- a/libopie/otimepicker.cpp
+++ b/libopie/otimepicker.cpp
@@ -175,8 +175,8 @@ OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags
 
-        connect ( m_timePicker, SIGNAL( timeChanged( const QTime& ) ),
-                  this, SLOT( setTime ( const QTime& ) ) );
-        connect ( minuteField, SIGNAL( textChanged ( const QString& ) ),
-                  this, SLOT ( setMinute ( const QString& ) ) );
-        connect ( hourField, SIGNAL( textChanged ( const QString& ) ),
-                  this, SLOT ( setHour ( const QString& ) ) );
+        connect ( m_timePicker, SIGNAL( timeChanged(const QTime&) ),
+                  this, SLOT( setTime(const QTime&) ) );
+        connect ( minuteField, SIGNAL( textChanged(const QString&) ),
+                  this, SLOT ( setMinute(const QString&) ) );
+        connect ( hourField, SIGNAL( textChanged(const QString&) ),
+                  this, SLOT ( setHour(const QString&) ) );
 
diff --git a/libopie/pim/ocontactaccess.cpp b/libopie/pim/ocontactaccess.cpp
index 2e3ec1f..bc359f7 100644
--- a/libopie/pim/ocontactaccess.cpp
+++ b/libopie/pim/ocontactaccess.cpp
@@ -23,2 +23,7 @@
  * $Log$
+ * Revision 1.9  2004/03/02 12:14:22  alwin
+ * 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)
+ *
  * Revision 1.8  2003/05/08 13:55:09  tille
@@ -93,8 +98,8 @@ OContactAccess::OContactAccess ( const QString appname, const QString ,
         QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
-        connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)),
-               this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+        connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+               this, SLOT(copMessage(const QCString&,const QByteArray&)) );
         if ( autosync ){
                 QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
-                connect( syncchannel, SIGNAL(received(const QCString &, const QByteArray &)),
-                         this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+                connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                         this, SLOT(copMessage(const QCString&,const QByteArray&)) );
         }
diff --git a/libopie/pim/opimmainwindow.cpp b/libopie/pim/opimmainwindow.cpp
index 2739e26..99a0333 100644
--- a/libopie/pim/opimmainwindow.cpp
+++ b/libopie/pim/opimmainwindow.cpp
@@ -20,6 +20,6 @@ OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent,
     m_channel= new QCopChannel(m_str, this );
-    connect(m_channel, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
-    connect(qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
+    connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
+    connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ),
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 
diff --git a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
index a75f9dc..789496c 100644
--- a/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
+++ b/libopie2/examples/opieui/osplitter_example/osplitter_mail.cpp
@@ -27,4 +27,4 @@ ListViews::ListViews( QWidget* p, const char* name, WFlags fl )
     lay->addWidget( m_splitter );
-    connect(m_splitter, SIGNAL(sizeChange(bool, const QSize& ) ),
-            this, SLOT(slotSizeChange(bool, const QSize& ) ) );
+    connect(m_splitter, SIGNAL(sizeChange(bool,const QSize&) ),
+            this, SLOT(slotSizeChange(bool,const QSize&) ) );
 
diff --git a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
index f62729c..0d8bc9f 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/opieuidemo.cpp
@@ -112,3 +112,3 @@ void OpieUIDemo::demoOCompletionBox()
 
-    connect( box, SIGNAL( activated( const QString& ) ), this, SLOT( messageBox( const QString& ) ) );
+    connect( box, SIGNAL( activated(const QString&) ), this, SLOT( messageBox(const QString&) ) );
     box->popup();
diff --git a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
index cf1e443..9db4e62 100644
--- a/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
+++ b/libopie2/examples/opieui/oversatileviewdemo/oversatileviewdemo.cpp
@@ -76,15 +76,15 @@ OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlag
     connect( vv, SIGNAL( selectionChanged() ), this, SLOT( selectionChanged() ) );
-    connect( vv, SIGNAL( selectionChanged( OVersatileViewItem * ) ), this, SLOT( selectionChanged( OVersatileViewItem * ) ) );
-    connect( vv, SIGNAL( currentChanged( OVersatileViewItem * ) ), this, SLOT( currentChanged( OVersatileViewItem * ) ) );
-    connect( vv, SIGNAL( clicked( OVersatileViewItem * ) ), this, SLOT( clicked( OVersatileViewItem * ) ) );
-    connect( vv, SIGNAL( pressed( OVersatileViewItem * ) ), this, SLOT( pressed( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( selectionChanged(OVersatileViewItem*) ), this, SLOT( selectionChanged(OVersatileViewItem*) ) );
+    connect( vv, SIGNAL( currentChanged(OVersatileViewItem*) ), this, SLOT( currentChanged(OVersatileViewItem*) ) );
+    connect( vv, SIGNAL( clicked(OVersatileViewItem*) ), this, SLOT( clicked(OVersatileViewItem*) ) );
+    connect( vv, SIGNAL( pressed(OVersatileViewItem*) ), this, SLOT( pressed(OVersatileViewItem*) ) );
 
-    connect( vv, SIGNAL( doubleClicked( OVersatileViewItem * ) ), this, SLOT( doubleClicked( OVersatileViewItem * ) ) );
-    connect( vv, SIGNAL( returnPressed( OVersatileViewItem * ) ), this, SLOT( returnPressed( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( doubleClicked(OVersatileViewItem*) ), this, SLOT( doubleClicked(OVersatileViewItem*) ) );
+    connect( vv, SIGNAL( returnPressed(OVersatileViewItem*) ), this, SLOT( returnPressed(OVersatileViewItem*) ) );
   
-    connect( vv, SIGNAL( onItem( OVersatileViewItem * ) ), this, SLOT( onItem( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( onItem(OVersatileViewItem*) ), this, SLOT( onItem(OVersatileViewItem*) ) );
     connect( vv, SIGNAL( onViewport() ), this, SLOT( onViewport() ) );
     
-    connect( vv, SIGNAL( expanded( OVersatileViewItem * ) ), this, SLOT( expanded( OVersatileViewItem * ) ) );
-    connect( vv, SIGNAL( collapsed( OVersatileViewItem * ) ), this, SLOT( collapsed( OVersatileViewItem * ) ) );
+    connect( vv, SIGNAL( expanded(OVersatileViewItem*) ), this, SLOT( expanded(OVersatileViewItem*) ) );
+    connect( vv, SIGNAL( collapsed(OVersatileViewItem*) ), this, SLOT( collapsed(OVersatileViewItem*) ) );
 
@@ -92,3 +92,3 @@ OVersatileViewDemo::OVersatileViewDemo( QWidget* parent, const char* name, WFlag
 
-    connect( vv, SIGNAL( contextMenuRequested( OVersatileViewItem *, const QPoint&, int ) ), this, SLOT( contextMenuRequested( OVersatileViewItem *, const QPoint&, int ) ) );
+    connect( vv, SIGNAL( contextMenuRequested(OVersatileViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(OVersatileViewItem*,const QPoint&,int) ) );
     
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index b8d48fe..27b0e53 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -147,3 +147,3 @@ void ODevice::initButtons()
     QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp
index cc4b01a..8ecea1b 100644
--- a/libopie2/opiecore/device/odevice_ipaq.cpp
+++ b/libopie2/opiecore/device/odevice_ipaq.cpp
@@ -214,3 +214,3 @@ void iPAQ::initButtons()
     QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp
index 31b9297..90aca2f 100644
--- a/libopie2/opiecore/device/odevice_simpad.cpp
+++ b/libopie2/opiecore/device/odevice_simpad.cpp
@@ -191,3 +191,3 @@ void SIMpad::initButtons()
     QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )), this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)), this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp
index a76f90b..d241db8 100644
--- a/libopie2/opiecore/device/odevice_yopy.cpp
+++ b/libopie2/opiecore/device/odevice_yopy.cpp
@@ -121,4 +121,4 @@ void Yopy::initButtons()
     QCopChannel *sysch = new QCopChannel( "QPE/System", this );
-    connect( sysch, SIGNAL( received( const QCString &, const QByteArray & ) ),
-             this, SLOT( systemMessage( const QCString &, const QByteArray & ) ) );
+    connect( sysch, SIGNAL( received(const QCString&,const QByteArray&) ),
+             this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 }
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 9d23a12..8ab3cbe 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -254,4 +254,4 @@ void Zaurus::initButtons()
     QCopChannel *sysch = new QCopChannel ( "QPE/System", this );
-    connect ( sysch, SIGNAL( received( const QCString &, const QByteArray & )),
-        this, SLOT( systemMessage ( const QCString &, const QByteArray & )));
+    connect ( sysch, SIGNAL( received(const QCString&,const QByteArray&)),
+        this, SLOT( systemMessage(const QCString&,const QByteArray&)));
 }
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp
index 0a361a1..6349c83 100644
--- a/libopie2/opiecore/oprocess.cpp
+++ b/libopie2/opiecore/oprocess.cpp
@@ -674,4 +674,4 @@ int OProcess::commSetupDoneP()
             innot->setEnabled( false ); // will be enabled when data has to be sent
-            QObject::connect( innot, SIGNAL( activated( int ) ),
-                              this, SLOT( slotSendData( int ) ) );
+            QObject::connect( innot, SIGNAL( activated(int) ),
+                              this, SLOT( slotSendData(int) ) );
         }
@@ -683,4 +683,4 @@ int OProcess::commSetupDoneP()
             CHECK_PTR( outnot );
-            QObject::connect( outnot, SIGNAL( activated( int ) ),
-                              this, SLOT( slotChildOutput( int ) ) );
+            QObject::connect( outnot, SIGNAL( activated(int) ),
+                              this, SLOT( slotChildOutput(int) ) );
             if ( communication & NoRead )
@@ -694,4 +694,4 @@ int OProcess::commSetupDoneP()
             CHECK_PTR( errnot );
-            QObject::connect( errnot, SIGNAL( activated( int ) ),
-                              this, SLOT( slotChildError( int ) ) );
+            QObject::connect( errnot, SIGNAL( activated(int) ),
+                              this, SLOT( slotChildError(int) ) );
         }
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index c12e138..4f9b504 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -75,8 +75,8 @@ OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
         QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
-        connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)),
-               this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+        connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+               this, SLOT(copMessage(const QCString&,const QByteArray&)) );
         if ( autosync ){
                 QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
-                connect( syncchannel, SIGNAL(received(const QCString &, const QByteArray &)),
-                         this, SLOT(copMessage( const QCString &, const QByteArray &)) );
+                connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
+                         this, SLOT(copMessage(const QCString&,const QByteArray&)) );
         }
diff --git a/libopie2/opiepim/ui/opimmainwindow.cpp b/libopie2/opiepim/ui/opimmainwindow.cpp
index 10ed743..40dc297 100644
--- a/libopie2/opiepim/ui/opimmainwindow.cpp
+++ b/libopie2/opiepim/ui/opimmainwindow.cpp
@@ -49,6 +49,6 @@ OPimMainWindow::OPimMainWindow( const QString& service, QWidget* parent,
     m_channel= new QCopChannel(m_str, this );
-    connect(m_channel, SIGNAL(received(const QCString&, const QByteArray& ) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
-    connect(qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ),
-            this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
+    connect(m_channel, SIGNAL(received(const QCString&,const QByteArray&) ),
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
+    connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&) ),
+            this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 
diff --git a/libopie2/opiepim/ui/opimrecurrencewidget.cpp b/libopie2/opiepim/ui/opimrecurrencewidget.cpp
index 569bdd5..90c1a5f 100644
--- a/libopie2/opiepim/ui/opimrecurrencewidget.cpp
+++ b/libopie2/opiepim/ui/opimrecurrencewidget.cpp
@@ -554,4 +554,4 @@ void OPimRecurrenceWidget::init() {
 
-    QObject::connect( repeatPicker, SIGNAL(dateClicked(int, int, int)),
-                      this, SLOT(endDateChanged(int, int, int)) );
+    QObject::connect( repeatPicker, SIGNAL(dateClicked(int,int,int)),
+                      this, SLOT(endDateChanged(int,int,int)) );
     QObject::connect( qApp, SIGNAL(weekChanged(bool)),
diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index 2a89c5d..e7daead 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -113,4 +113,4 @@ OFileDialog::OFileDialog(const QString &caption,
 #if 0
-    connect(file, SIGNAL(dirSelected(const QString &) ),
-            this, SLOT(slotDirSelected(const QString &) ) );
+    connect(file, SIGNAL(dirSelected(const QString&) ),
+            this, SLOT(slotDirSelected(const QString&) ) );
 #endif
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index 600daff..15cadd4 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -212,3 +212,3 @@ QWidget* ODocumentFileView::widget( QWidget* parent )
         m_selector = new FileSelector(currentMimeType().join(";"), parent, "fileselector", showNew(), showClose() );
-        QObject::connect(m_selector, SIGNAL(fileSelected( const DocLnk& ) ),
+        QObject::connect(m_selector, SIGNAL(fileSelected(const DocLnk&) ),
                          selector(), SLOT(slotDocLnkBridge(const DocLnk&) ) );
@@ -216,4 +216,4 @@ QWidget* ODocumentFileView::widget( QWidget* parent )
                          selector(), SIGNAL(closeMe() ) );
-        QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk& ) ),
-                         selector(), SIGNAL(newSelected(const DocLnk& ) ) );
+        QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk&) ),
+                         selector(), SIGNAL(newSelected(const DocLnk&) ) );
     }
@@ -526,4 +526,4 @@ void OFileViewFileListView::connectSlots()
             this, SLOT(slotCurrentChanged(QListViewItem*) ) );
-    connect(m_view, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint&, int ) ),
-            this, SLOT(slotClicked(int, QListViewItem*, const QPoint&, int ) ) );
+    connect(m_view, SIGNAL(mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),
+            this, SLOT(slotClicked(int,QListViewItem*,const QPoint&,int) ) );
 }
@@ -981,4 +981,4 @@ void OFileSelector::initViews()
     m_cmbView->insertItem( QObject::tr("All Files") );
-    connect(m_cmbView, SIGNAL(activated( const QString& ) ),
-            this, SLOT(slotViewChange( const QString& ) ) );
+    connect(m_cmbView, SIGNAL(activated(const QString&) ),
+            this, SLOT(slotViewChange(const QString&) ) );
 
diff --git a/libopie2/opieui/ofontselector.cpp b/libopie2/opieui/ofontselector.cpp
index 49ddeb6..f93781f 100644
--- a/libopie2/opieui/ofontselector.cpp
+++ b/libopie2/opieui/ofontselector.cpp
@@ -134,3 +134,3 @@ OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *nam
     gridLayout->addMultiCellWidget( d->m_font_family_list, 0, 4, 0, 0 );
-    connect( d->m_font_family_list, SIGNAL( highlighted( int ) ), this, SLOT( fontFamilyClicked( int ) ) );
+    connect( d->m_font_family_list, SIGNAL( highlighted(int) ), this, SLOT( fontFamilyClicked(int) ) );
 
@@ -140,3 +140,3 @@ OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *nam
     d->m_font_style_list = new QComboBox( this, "StyleListBox" );
-    connect( d->m_font_style_list, SIGNAL(  activated( int ) ), this, SLOT( fontStyleClicked( int ) ) );
+    connect( d->m_font_style_list, SIGNAL(  activated(int) ), this, SLOT( fontStyleClicked(int) ) );
     gridLayout->addWidget( d->m_font_style_list, 1, 1 );
@@ -147,4 +147,4 @@ OFontSelector::OFontSelector( bool withpreview, QWidget *parent, const char *nam
     d->m_font_size_list = new QComboBox( this, "SizeListBox" );
-    connect( d->m_font_size_list, SIGNAL(  activated( int ) ),
-             this, SLOT( fontSizeClicked( int ) ) );
+    connect( d->m_font_size_list, SIGNAL(  activated(int) ),
+             this, SLOT( fontSizeClicked(int) ) );
     gridLayout->addWidget( d->m_font_size_list, 3, 1 );
diff --git a/libopie2/opieui/otabwidget.cpp b/libopie2/opieui/otabwidget.cpp
index ec6af9d..f47c90b 100644
--- a/libopie2/opieui/otabwidget.cpp
+++ b/libopie2/opieui/otabwidget.cpp
@@ -76,3 +76,3 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
     tabBarStack->addWidget( tabBar, 0 );
-    connect( tabBar, SIGNAL( selected( int ) ), this, SLOT( slotTabBarSelected( int ) ) );
+    connect( tabBar, SIGNAL( selected(int) ), this, SLOT( slotTabBarSelected(int) ) );
 
@@ -80,3 +80,3 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
     tabBarStack->addWidget( tabList, 1 );
-    connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
+    connect( tabList, SIGNAL( activated(int) ), this, SLOT( slotTabListSelected(int) ) );
 
diff --git a/libopie2/opieui/otimepicker.cpp b/libopie2/opieui/otimepicker.cpp
index d4712a4..66f9ce0 100644
--- a/libopie2/opieui/otimepicker.cpp
+++ b/libopie2/opieui/otimepicker.cpp
@@ -223,8 +223,8 @@ OTimePickerDialog::OTimePickerDialog ( QWidget* parent, const char* name, WFlags
 
-    connect ( m_timePicker, SIGNAL( timeChanged( const QTime& ) ),
-              this, SLOT( setTime ( const QTime& ) ) );
-    connect ( minuteField, SIGNAL( textChanged ( const QString& ) ),
-              this, SLOT ( setMinute ( const QString& ) ) );
-    connect ( hourField, SIGNAL( textChanged ( const QString& ) ),
-              this, SLOT ( setHour ( const QString& ) ) );
+    connect ( m_timePicker, SIGNAL( timeChanged(const QTime&) ),
+              this, SLOT( setTime(const QTime&) ) );
+    connect ( minuteField, SIGNAL( textChanged(const QString&) ),
+              this, SLOT ( setMinute(const QString&) ) );
+    connect ( hourField, SIGNAL( textChanged(const QString&) ),
+              this, SLOT ( setHour(const QString&) ) );
 
diff --git a/libopie2/opieui/oversatileview.cpp b/libopie2/opieui/oversatileview.cpp
index 8839456..78154b7 100644
--- a/libopie2/opieui/oversatileview.cpp
+++ b/libopie2/opieui/oversatileview.cpp
@@ -172,7 +172,7 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     #if (QT_VERSION >= 0x030000)
-    connect( _listview, SIGNAL( contextMenuRequested( QListViewItem*, const QPoint&, int ) ), this, SLOT( contextMenuRequested( QListViewItem*, const QPoint&, int ) ) );
-    connect( _iconview, SIGNAL( contextMenuRequested( QIconViewItem*, const QPoint& ) ), this, SLOT( contextMenuRequested( QIconViewItem*, const QPoint& ) ) );
+    connect( _listview, SIGNAL( contextMenuRequested(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
+    connect( _iconview, SIGNAL( contextMenuRequested(QIconViewItem*,const QPoint&) ), this, SLOT( contextMenuRequested(QIconViewItem*,const QPoint&) ) );
     #else
-    connect( _listview, SIGNAL( rightButtonPressed( QListViewItem*, const QPoint&, int ) ), this, SLOT( contextMenuRequested( QListViewItem*, const QPoint&, int ) ) );
-    connect( _iconview, SIGNAL( rightButtonPressed( QIconViewItem*, const QPoint& ) ), this, SLOT( contextMenuRequested( QIconViewItem*, const QPoint& ) ) );
+    connect( _listview, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ), this, SLOT( contextMenuRequested(QListViewItem*,const QPoint&,int) ) );
+    connect( _iconview, SIGNAL( rightButtonPressed(QIconViewItem*,const QPoint&) ), this, SLOT( contextMenuRequested(QIconViewItem*,const QPoint&) ) );
     #endif
@@ -189,11 +189,11 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     connect( _listview, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
-    connect( _listview, SIGNAL( selectionChanged( QListViewItem * ) ), this, SLOT( selectionChanged( QListViewItem * ) ) );
-    connect( _listview, SIGNAL( currentChanged( QListViewItem * ) ), this, SLOT( currentChanged( QListViewItem * ) ) );   
-    connect( _listview, SIGNAL( clicked( QListViewItem * ) ), this, SLOT( clicked( QListViewItem * ) ) );
-    connect( _listview, SIGNAL( pressed( QListViewItem * ) ), this, SLOT( pressed( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( selectionChanged(QListViewItem*) ), this, SLOT( selectionChanged(QListViewItem*) ) );
+    connect( _listview, SIGNAL( currentChanged(QListViewItem*) ), this, SLOT( currentChanged(QListViewItem*) ) );   
+    connect( _listview, SIGNAL( clicked(QListViewItem*) ), this, SLOT( clicked(QListViewItem*) ) );
+    connect( _listview, SIGNAL( pressed(QListViewItem*) ), this, SLOT( pressed(QListViewItem*) ) );
     
-    connect( _listview, SIGNAL( doubleClicked( QListViewItem * ) ), this, SLOT( doubleClicked( QListViewItem * ) ) );
-    connect( _listview, SIGNAL( returnPressed( QListViewItem * ) ), this, SLOT( returnPressed( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( doubleClicked(QListViewItem*) ) );
+    connect( _listview, SIGNAL( returnPressed(QListViewItem*) ), this, SLOT( returnPressed(QListViewItem*) ) );
     
-    connect( _listview, SIGNAL( onItem( QListViewItem * ) ), this, SLOT( onItem( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( onItem(QListViewItem*) ), this, SLOT( onItem(QListViewItem*) ) );
     connect( _listview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
@@ -203,11 +203,11 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     connect( _iconview, SIGNAL( selectionChanged() ), this, SIGNAL( selectionChanged() ) );
-    connect( _iconview, SIGNAL( selectionChanged( QIconViewItem * ) ), this, SLOT( selectionChanged( QIconViewItem * ) ) );
-    connect( _iconview, SIGNAL( currentChanged( QIconViewItem * ) ), this, SLOT( currentChanged( QIconViewItem * ) ) );   
-    connect( _iconview, SIGNAL( clicked( QIconViewItem * ) ), this, SLOT( clicked( QIconViewItem * ) ) );
-    connect( _iconview, SIGNAL( pressed( QIconViewItem * ) ), this, SLOT( pressed( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( selectionChanged(QIconViewItem*) ), this, SLOT( selectionChanged(QIconViewItem*) ) );
+    connect( _iconview, SIGNAL( currentChanged(QIconViewItem*) ), this, SLOT( currentChanged(QIconViewItem*) ) );   
+    connect( _iconview, SIGNAL( clicked(QIconViewItem*) ), this, SLOT( clicked(QIconViewItem*) ) );
+    connect( _iconview, SIGNAL( pressed(QIconViewItem*) ), this, SLOT( pressed(QIconViewItem*) ) );
     
-    connect( _iconview, SIGNAL( doubleClicked( QIconViewItem * ) ), this, SLOT( doubleClicked( QIconViewItem * ) ) );
-    connect( _iconview, SIGNAL( returnPressed( QIconViewItem * ) ), this, SLOT( returnPressed( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( doubleClicked(QIconViewItem*) ), this, SLOT( doubleClicked(QIconViewItem*) ) );
+    connect( _iconview, SIGNAL( returnPressed(QIconViewItem*) ), this, SLOT( returnPressed(QIconViewItem*) ) );
     
-    connect( _iconview, SIGNAL( onItem( QIconViewItem * ) ), this, SLOT( onItem( QIconViewItem * ) ) );
+    connect( _iconview, SIGNAL( onItem(QIconViewItem*) ), this, SLOT( onItem(QIconViewItem*) ) );
     connect( _iconview, SIGNAL( onViewport() ), this, SIGNAL( onViewport() ) );
@@ -216,4 +216,4 @@ OVersatileView::OVersatileView( QWidget* parent, const char* name, int mode )
     
-    connect( _listview, SIGNAL( expanded( QListViewItem * ) ), this, SLOT( expanded( QListViewItem * ) ) );
-    connect( _listview, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( collapsed( QListViewItem * ) ) );
+    connect( _listview, SIGNAL( expanded(QListViewItem*) ), this, SLOT( expanded(QListViewItem*) ) );
+    connect( _listview, SIGNAL( collapsed(QListViewItem*) ), this, SLOT( collapsed(QListViewItem*) ) );