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)

76 files changed, 372 insertions, 372 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
@@ -47,23 +47,23 @@
 using namespace Opie;
 
 CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
         pm( Resource::loadPixmap( "cardmon/pcmcia" ) )
 {
 
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     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&) ) );
 
     QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
     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&) ) );
 
     cardInPcmcia0 = FALSE;
     cardInPcmcia1 = FALSE;
     cardInSd = FALSE;
 
     setFocusPolicy( NoFocus );
 
     setFixedWidth ( AppLnk::smallIconSize() );
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
@@ -41,19 +41,19 @@ ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget(
 
         QImage img = Resource::loadImage( "paste");
         img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
 
         m_clipboardPixmap.convertFromImage( img );
 
         m_timer = new QTimer ( this );
 
-        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()));
 
         m_menu = 0;
         m_dirty = true;
         m_lasttext = QString::null;
 
         m_timer-> start ( 0, true );
 }
 
@@ -94,17 +94,17 @@ void ClipboardApplet::mousePressEvent ( QMouseEvent *)
                         }
                         m_menu-> setItemChecked ( m_history. count ( ) - 1, true );
                         m_menu-> insertSeparator ( );
                 }
                 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 );
                 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 );
                 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 );
 
-                connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int )));
+                connect ( m_menu, SIGNAL( activated(int)), this, SLOT( action(int)));
 
                 m_dirty = false;
         }
         QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
         QSize s = m_menu-> sizeHint ( );
 
         m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )));
 }
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
@@ -25,19 +25,19 @@
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/config.h>
 
 LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
 {
     // If you want a sunken border around the clock do this:
     // setFrameStyle( QFrame::Panel | QFrame::Sunken );
     //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();
     timerId = 0;
     timerEvent( 0 );
     show();
 }
 
 int LauncherClock::position()
 {
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
@@ -55,17 +55,17 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
         m_receive_active = false;
         m_receive_state_changed = false;
         m_popup = 0;
                 m_wasOn = false;
                 m_wasDiscover = false;
 
         QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
         connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
-                this, SLOT(slotMessage(const QCString&, const QByteArray& ) ) );
+                this, SLOT(slotMessage(const QCString&,const QByteArray&) ) );
 }
 
 int IrdaApplet::position()
 {
         return 6;
 }
 
 void IrdaApplet::show()
@@ -92,17 +92,17 @@ void IrdaApplet::popup ( QString message, QString icon )
         else
                 m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 );
 
         QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
         QSize s = m_popup-> sizeHint ( );
         m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
                                    p. y ( ) - s. height ( )));
 
-        QTimer::singleShot ( 2000, this, SLOT( popupTimeout ( )));
+        QTimer::singleShot ( 2000, this, SLOT( popupTimeout()));
 }
 
 void IrdaApplet::popupTimeout ( )
 {
         m_popup-> hide ( );
 }
 
 bool IrdaApplet::checkIrdaStatus ( )
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
@@ -19,18 +19,18 @@
 #include <qpe/qcopenvelope_qws.h>
 
 /* QT */
 #include <qdir.h>
 
 Multikey::Multikey(QWidget *parent) : QLabel(parent), popupMenu(this), current("EN")
 {
     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&)));
 
     setFont( QFont( "Helvetica", 10, QFont::Normal ) );
     QPEApplication::setStylusOperation(this, QPEApplication::RightOnHold);
     lang = 0;
     QCopEnvelope e("MultiKey/Keyboard", "getmultikey()");
     setText("EN");
     popupMenu.insertItem("EN", 0);
     show();
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
@@ -43,18 +43,18 @@ using namespace Opie;
 #include <time.h>
 
 RotateApplet::RotateApplet()
              :QObject( 0, "RotateApplet" ), m_flipped( false )
 {
 
 #if !defined(QT_NO_COP)
     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
 
 }
 
 RotateApplet::~RotateApplet ( )
 {}
 
 /**
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
@@ -294,19 +294,19 @@ ScreenshotControl::ScreenshotControl( QWidget *parent, const char *name )
   hbox-> addWidget ( scapButton );
 
   setFixedSize ( sizeHint ( ));
   setFocusPolicy ( QWidget::NoFocus );
 
 
   grabTimer = new QTimer ( this, "grab timer");
   
-  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()));
 }
 
 void ScreenshotControl::slotGrab()
 {
   buttonPushed = 1;
   hide();
 
   setFileName = FALSE;
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
@@ -208,18 +208,18 @@ VMemo::VMemo( QWidget *parent, const char *_name )
 
     qDebug("toggleKey %d", toggleKey);
     if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
          systemZaurus=TRUE;
     else 
       systemZaurus=FALSE;
       
     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&)) );
 
     if( toggleKey != -1 ) {
       // keyRegister(key, channel, message)
       QCopEnvelope e("QPE/Launcher", "keyRegister(int,QCString,QCString)");
       //           e << 4096; // Key_Escape
       //          e << Key_F5; //4148
       e << toggleKey;
       e << QString("QPE/VMemo");
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
@@ -403,37 +403,37 @@ VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *pa
   }
 
   vbox-> addStretch ( 100 );
 
   setFixedSize ( sizeHint ( ));
   setFocusPolicy ( QWidget::NoFocus );
 
   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)));
 
   // initialize variables
 
   readConfig ( true );
 
   // initialize the config file, in case some entries are missing
 
   writeConfigEntry ( "VolumePercent", m_vol_percent,   UPD_None );
@@ -719,18 +719,18 @@ VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
   setFixedWidth ( AppLnk::smallIconSize()  );
   setFixedHeight ( AppLnk::smallIconSize()+4 );
 
   m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" ));
   m_dialog = new VolumeControl ( this, true, this, "volumecontrol" );
 
-  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)));
 }
 
 VolumeApplet::~VolumeApplet()
 {
   delete m_pixmap;
 }
 
 int VolumeApplet::position()
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
@@ -46,17 +46,17 @@ CommandEditDialog::CommandEditDialog(QWidget *parent, const char* name, WFlags f
   item = new QListViewItem( m_SuggestedCommandList,"umount ");
   item = new QListViewItem( m_SuggestedCommandList,"mknod ");
   item = new QListViewItem( m_SuggestedCommandList,"netstat ");
   item = new QListViewItem( m_SuggestedCommandList,"route ");
   item = new QListViewItem( m_SuggestedCommandList,"cardctl eject ");
   m_SuggestedCommandList->setSelected(m_SuggestedCommandList->firstChild(),TRUE);
   m_SuggestedCommandList->sort();
 
-  connect( m_SuggestedCommandList, SIGNAL( clicked( QListViewItem * ) ), m_PlayListSelection, SLOT( addToSelection( QListViewItem *) ) );
+  connect( m_SuggestedCommandList, SIGNAL( clicked(QListViewItem*) ), m_PlayListSelection, SLOT( addToSelection(QListViewItem*) ) );
 
 
 
   ToolButton1->setTextLabel("new");
   ToolButton1->setPixmap(Resource::loadPixmap("new"));
   ToolButton1->setAutoRaise(TRUE);
   ToolButton1->setFocusPolicy(QWidget::NoFocus);
   connect(ToolButton1,SIGNAL(clicked()),this,SLOT(showAddDialog()));
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
@@ -46,18 +46,18 @@ TESession::TESession(QMainWindow* main, TEWidget* _te, const char* _pgm, QStrLis
 */
   QObject::connect( em,SIGNAL(sndBlock(const char*,int)),
                     sh,SLOT(send_bytes(const char*,int)) );
   QObject::connect( em,SIGNAL(changeColumns(int)),
                     main,SLOT(changeColumns(int)) );
 
   
 
-  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&)) );
 
   QObject::connect( sh,SIGNAL(done(int)), this,SLOT(done(int)) );
 }
 
 
 
 void TESession::run()
 {
@@ -67,18 +67,18 @@ void TESession::run()
 
 void TESession::kill(int ) // signal)
 {
 //  sh->kill(signal);
 }
 
 TESession::~TESession()
 {
- QObject::disconnect( sh, SIGNAL( done( int ) ),
-                      this, SLOT( done( int ) ) );
+ QObject::disconnect( sh, SIGNAL( done(int) ),
+                      this, SLOT( done(int) ) );
   delete em;
   delete sh;
 }
 
 void TESession::setConnect(bool c)
 {
   em->setConnect(c);
 }
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
@@ -65,59 +65,59 @@ void HelpBrowser::init( const QString& _home )
     QMenuBar *menu = new QMenuBar( toolbar );
 
     toolbar = new QToolBar( this );
     // addToolBar( toolbar, "Toolbar");
 
     QPopupMenu* go = new QPopupMenu( this );
     backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 );
     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 );
     backAction->addTo( toolbar );
     backAction->setEnabled( FALSE );
 
     forwardAction = new QAction( tr( "Forward" ), Resource::loadIconSet( "forward" ), QString::null, 0, this, 0 );
     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 );
     forwardAction->addTo( toolbar );
     forwardAction->setEnabled( FALSE );
 
     QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), browser, SLOT( home() ) );
     a->addTo( go );
     a->addTo( toolbar );
 
     bookm = new QPopupMenu( this );
     bookm->insertItem( tr( "Add Bookmark" ), this, SLOT( addBookmark() ) );
     bookm->insertItem( tr( "Remove from Bookmarks" ), this, SLOT( removeBookmark() ) );
     bookm->insertSeparator();
-    connect( bookm, SIGNAL( activated( int ) ),
-             this, SLOT( bookmChosen( int ) ) );
+    connect( bookm, SIGNAL( activated(int) ),
+             this, SLOT( bookmChosen(int) ) );
 
     readBookmarks();
 
     menu->insertItem( tr("Go"), go );
     menu->insertItem( tr( "Bookmarks" ), bookm );
 
     resize( 240, 300 );
     browser->setFocus();
     browser->setFrameStyle( QFrame::NoFrame );
 
 #if !defined(QT_NO_COP)
         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&)) );
 }
 
 void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data)
 {
         qDebug("reached appMessage");
     if ( msg == "showFile(QString)" ) {
         QDataStream ds(data,IO_ReadOnly);
         QString fn;
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
@@ -158,18 +158,18 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     doc = 0;
     edited=false;
     fromSetDocument=false;
 
     setToolBarsMovable( false );
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     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&)) );
 
     setIcon( Resource::loadPixmap( "TextEditor" ) );
 
     QToolBar *bar = new QToolBar( this );
     bar->setHorizontalStretchable( true );
     menu = bar;
 
     QMenuBar *mb = new QMenuBar( bar );
@@ -320,17 +320,17 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 
     searchBar = new QToolBar(this);
     addToolBar( searchBar,  "Search", QMainWindow::Top, true );
 
     searchBar->setHorizontalStretchable( true );
 
     searchEdit = new QLineEdit( searchBar, "searchEdit" );
     searchBar->setStretchableWidget( searchEdit );
-    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
+    connect( searchEdit, SIGNAL( textChanged(const QString&) ),
        this, SLOT( search() ) );
 
     a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ),
                      QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
     a->addTo( searchBar );
     a->addTo( edit );
 
@@ -578,18 +578,18 @@ void TextEdit::doSearchBar() {
         searchBar->hide();
     else
         searchBar->show();
 }
 
 #if 0
 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)));
 
     //case sensitive, backwards, [category]
 
     connect( editor, SIGNAL(notFound()),
        &frmFind, SLOT(slotNotFound()) );
     connect( editor, SIGNAL(searchWrapped()),
        &frmFind, SLOT(slotWrapAround()) );
 
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,12 +1,12 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -16,31 +16,33 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
 #include "appicons.h"
 
-#include <qpe/qcopenvelope_qws.h>
+#ifdef QWS
+#include <qtopia/qcopenvelope_qws.h>
+#endif
 
 #include <qtooltip.h>
 #include <qpixmap.h>
 
 
 AppIcons::AppIcons( QWidget *parent ) :
     QHBox(parent)
 {
     buttons.setAutoDelete(TRUE);
 
 #ifndef QT_NO_COP
     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
 }
 
 void AppIcons::setIcon(int id, const QPixmap& pm)
 {
     button(id)->setPixmap(pm);
 }
 
@@ -63,17 +65,17 @@ signals:
     void clicked(const QPoint&, int, bool);
 };
 
 QLabel* AppIcons::button(int id)
 {
     QLabel* f = buttons.find(id);
     if ( !f ) {
         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();
     }
     return f;
 }
 
 int AppIcons::findId(QLabel* b)
 {
     QIntDictIterator<QLabel> it(buttons);
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
@@ -81,22 +81,22 @@ private:
 
 AppLauncher::AppLauncher(QObject *parent, const char *name)
     : QObject(parent, name), qlPid(0), qlReady(FALSE),
       appKillerBox(0)
 {
     connect(qwsServer, SIGNAL(newChannel(const QString&)), this, SLOT(newQcopChannel(const QString&)));
     connect(qwsServer, SIGNAL(removedChannel(const QString&)), this, SLOT(removedQcopChannel(const QString&)));
     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&)) );
 
 #ifndef Q_OS_WIN32
     signal(SIGCHLD, signalHandler);
 #else
     runningAppsProc.setAutoDelete( TRUE );
 #endif
     QString tmp = qApp->argv()[0];
     int pos = tmp.findRev('/');
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
@@ -93,18 +93,18 @@ FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
     setGeometry( 0, 0, desk.width(), desk.height() );
 
     connect(qwsServer, SIGNAL(newChannel(const QString&)),
         this, SLOT(newQcopChannel(const QString&)));
 
     // Create a DocumentList so appLauncher has appLnkSet to search
     docList = new DocumentList( 0, FALSE );
     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&)) );
 
     // more hackery
     // I will be run as either the main server or as part of the main server
     QWSServer::setScreenSaverIntervals(0);
     loadPixmaps();
 
     //check if there is a language program
 #ifndef Q_OS_WIN32
@@ -152,18 +152,18 @@ FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
     next->setGeometry(x, 0, buttonWidth, controlHeight);
 
     taskBar->setGeometry( 0, height() - controlHeight, desk.width(), controlHeight);
     taskBar->hide();
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     qDebug("Setting up QCop to QPE/System");
     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
     calcMaxWindowRect();
 
     m_calHandler = ( QWSServer::mouseHandler() && QWSServer::mouseHandler()->inherits("QCalibratedMouseHandler") ) ? true : false;
 
     if ( m_calHandler) {
         if ( !QFile::exists("/etc/pointercal") ) {
             needCalibrate = TRUE;
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
@@ -140,18 +140,18 @@ InputMethods::InputMethods( QWidget *parent ) :
     imChoice->setFixedWidth( 13 );
     imChoice->setAutoRaise( TRUE );
     hbox->addWidget( imChoice );
     connect( imChoice, SIGNAL(clicked()), this, SLOT(chooseIm()) );
 
     loadInputMethods();
 
     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&)) );
 }
 
 InputMethods::~InputMethods()
 {
     Config cfg("qpe");
     cfg.setGroup("InputMethod");
     if (imethod)
         cfg.writeEntry("im", imethod->name() );
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
@@ -93,20 +93,20 @@ LauncherTabWidget::LauncherTabWidget( Launcher* parent ) :
     categoryBar->setPalette( pal );
     stack = new QWidgetStack(this);
     connect( categoryBar, SIGNAL(selected(int)), this, SLOT(raiseTabWidget()) );
     categoryBar->show();
     stack->show();
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     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
 
     createDocLoadingWidget();
 }
 
 void LauncherTabWidget::createDocLoadingWidget()
 {
     // Construct the 'doc loading widget' shown when finding documents
@@ -472,18 +472,18 @@ void Launcher::createGUI()
         this, SLOT(viewSelected(const QString&)) );
     connect( tabs, SIGNAL(clicked(const AppLnk*)),
         this, SLOT(select(const AppLnk*)));
     connect( tabs, SIGNAL(rightPressed(AppLnk*)),
         this, SLOT(properties(AppLnk*)));
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     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
 
     // all documents
     QImage img( Resource::loadImage( "DocsIcon" ) );
     QPixmap pm;
     pm = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
     // It could add this itself if it handles docs
 
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
@@ -610,24 +610,24 @@ LauncherView::LauncherView( QWidget* parent, const char* name, WFlags fl )
     icons->setFrameStyle( QFrame::NoFrame );
     icons->setMargin( 0 );
     icons->setSelectionMode( QIconView::NoSelection );
     icons->setBackgroundMode( PaletteBase );
     icons->setResizeMode( QIconView::Fixed );
     vmode = (ViewMode)-1;
     setViewMode( Icon );
 
-    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*)) );
 
     tools = 0;
     setBackgroundType( Ruled, QString::null );
 }
 
 LauncherView::~LauncherView()
 {
     if ( bgCache && bgCache->contains( bgName ) )
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
@@ -47,18 +47,18 @@
 
 
 PackageHandler::PackageHandler( QObject *parent, char* name )
     : QObject( parent, name ), packageChannel( 0 ), currentProcess( 0 ), mNoSpaceLeft( FALSE )
 {
     // setup qcop channel
 #ifndef QT_NO_COP
     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
 }
 
 void PackageHandler::qcopMessage( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
 
     if ( msg == "installPackage(QString)" ) {
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
@@ -60,21 +60,21 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent,
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
         qWarning( "Failed to bind to port %d", port );
     else {
 #ifndef QT_NO_COP
         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
     }
     sendSync = FALSE;
     openConnections.setAutoDelete( TRUE );
     authorizeConnections();
 }
 
 QCopBridge::~QCopBridge()
@@ -87,28 +87,28 @@ QCopBridge::~QCopBridge()
 void QCopBridge::authorizeConnections()
 {
     Config cfg("Security");
     cfg.setGroup("SyncMode");
     m_mode = Mode(cfg.readNumEntry("Mode", Sharp ));
     QListIterator<QCopBridgePI> it(openConnections);
     while ( it.current() ) {
         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() );
         } else
             ++it;
     }
 }
 
 void QCopBridge::newConnection( int socket )
 {
     QCopBridgePI *pi = new QCopBridgePI( socket, this );
     openConnections.append( pi );
-    connect ( pi, SIGNAL( connectionClosed( QCopBridgePI *) ), this, SLOT( closed( QCopBridgePI *) ) );
+    connect ( pi, SIGNAL( connectionClosed(QCopBridgePI*) ), this, SLOT( closed(QCopBridgePI*) ) );
 
     /* ### libqtopia merge FIXME */
 #if 0
     QPEApplication::setTempScreenSaverMode( QPEApplication::DisableSuspend );
 #endif
 #ifndef QT_NO_COP
     QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 #endif
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
@@ -29,18 +29,18 @@
 
 #include "runningappbar.h"
 #include "serverinterface.h"
 
 RunningAppBar::RunningAppBar(QWidget* parent)
   : QFrame(parent), selectedAppIndex(-1)
 {
     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&)) );
 
     spacing = AppLnk::smallIconSize()+3;
 }
 
 RunningAppBar::~RunningAppBar()
 {
 }
 
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
@@ -142,40 +142,40 @@ Server::Server() :
     connect( tsmMonitor, SIGNAL(forceSuspend()), qApp, SIGNAL(power()) );
 #endif
 
     serverGui = new Launcher;
     serverGui->createGUI();
 
     docList = new DocumentList( serverGui );
     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&)) );
 
     storage = new StorageInfo( this );
     connect( storage, SIGNAL(disksChanged()), this, SLOT(storageChanged()) );
 
     // start services
     startTransferServer();
     (void) new IrServer( this );
 
     packageHandler = new PackageHandler( this );
     connect(qApp, SIGNAL(activate(const Opie::ODeviceButton*,bool)),
             this,SLOT(activate(const Opie::ODeviceButton*,bool)));
 
     setGeometry( -10, -10, 9, 9 );
 
     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&)) );
 
     connect( qApp, SIGNAL(prepareForRestart()), this, SLOT(terminateServers()) );
     connect( qApp, SIGNAL(timeChanged()), this, SLOT(pokeTimeMonitors()) );
 
     preloadApps();
 }
 
 void Server::show()
@@ -608,18 +608,18 @@ void Server::styleChange( QStyle &s )
 
 void Server::startTransferServer()
 {
     if ( !qcopBridge ) {
         // start qcop bridge server
         qcopBridge = new QCopBridge( 4243 );
         if ( qcopBridge->ok() ) {
             // ... OK
-            connect( qcopBridge, SIGNAL(connectionClosed(const QHostAddress &)),
-                    this, SLOT(syncConnectionClosed(const QHostAddress &)) );
+            connect( qcopBridge, SIGNAL(connectionClosed(const QHostAddress&)),
+                    this, SLOT(syncConnectionClosed(const QHostAddress&)) );
         } else {
             delete qcopBridge;
             qcopBridge = 0;
         }
     }
     if ( !transferServer ) {
         // start transfer server
         transferServer = new TransferServer( 4242 );
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
@@ -296,28 +296,28 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
 
     m_apm_timer = new QTimer( this );
     connect(m_apm_timer, SIGNAL( timeout() ),
             this, SLOT( apmTimeout() ) );
 
     reloadPowerWarnSettings();
 
     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&) ) );
 
     m_screensaver = new OpieScreenSaver();
     m_screensaver->setInterval( -1 );
     QWSServer::setScreenSaver( m_screensaver );
 
-    connect( qApp, SIGNAL( volumeChanged( bool ) ),
+    connect( qApp, SIGNAL( volumeChanged(bool) ),
              this, SLOT( rereadVolumes() ) );
 
 
     /* ### PluginLoader libqtopia SafeMode */
 #if 0
     if ( PluginLoader::inSafeMode() )
         QTimer::singleShot(500, this, SLOT(showSafeMode()) );
     QTimer::singleShot(20*1000, this, SLOT(clearSafeMode()) );
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
@@ -101,20 +101,20 @@ ShutdownImpl::ShutdownImpl( QWidget* parent, const char *name, WFlags fl )
 
         QPushButton *cancel = new QPushButton ( tr( "Cancel" ), this, "cancel" );
         changeButtonColor ( cancel, QColor( 181, 222, 178 ) );
         cancel-> setDefault ( true );
         cancel-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding, cancel-> sizePolicy ( ). hasHeightForWidth ( ) ) );
         vbox-> addWidget ( cancel );
 
         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() ) );
 
         m_progress-> hide ( );
         Global::hideInputMethod ( );
 }
 
 void ShutdownImpl::buttonClicked ( int b )
 {
         m_counter = 0;
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
@@ -208,18 +208,18 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
     lockState = new LockKeyState( this );
 #else
     lockState = 0;
 #endif
 
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     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
 #endif
     waitTimer = new QTimer( this );
     connect( waitTimer, SIGNAL( timeout() ), this, SLOT( stopWait() ) );
     clearer = new QTimer( this );
     QObject::connect(clearer, SIGNAL(timeout()), SLOT(clearStatusBar()));
 
     connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) );
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
@@ -68,17 +68,17 @@ TransferServer::TransferServer( Q_UINT16 port, QObject *parent,
         qWarning( "Failed to bind to port %d", port );
 }
 
 void TransferServer::authorizeConnections()
 {
     QListIterator<ServerPI> it(connections);
     while ( it.current() ) {
         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() );
         } else
             ++it;
     }
 }
 
 void TransferServer::closed(ServerPI *item)
 {
@@ -87,17 +87,17 @@ void TransferServer::closed(ServerPI *item)
 
 TransferServer::~TransferServer()
 {
 }
 
 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 );
 }
 
 QString SyncAuthentication::serverId()
 {
     Config cfg("Security");
     cfg.setGroup("Sync");
     QString r = cfg.readEntry("serverid");
@@ -328,29 +328,29 @@ ServerPI::ServerPI( int socket, QObject *parent, const char* name )
             wait[i] = FALSE;
 
         send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
         state = Wait_USER;
 
         dtp = new ServerDTP( this );
         connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
         connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
-        connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
+        connect( dtp, SIGNAL( error(int) ), SLOT( dtpError(int) ) );
 
 
         directory = QDir::currentDirPath();
 
         static int p = 1024;
 
         while ( !serversocket || !serversocket->ok() ) {
             delete serversocket;
             serversocket = new ServerSocket( ++p, this );
         }
-        connect( serversocket, SIGNAL( newIncomming( int ) ),
-                 SLOT( newConnection( int ) ) );
+        connect( serversocket, SIGNAL( newIncomming(int) ),
+                 SLOT( newConnection(int) ) );
     }
 }
 
 ServerPI::~ServerPI()
 {
     close();
 
     if ( dtp )
@@ -1081,17 +1081,17 @@ void ServerPI::timerEvent( QTimerEvent * )
 
 ServerDTP::ServerDTP( QObject *parent, const char* name)
   : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ),
     retrieveTargzProc( 0 )
 {
 
   connect( this, SIGNAL( connected() ), SLOT( connected() ) );
   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() ) );
 
   createTargzProc = new QProcess( QString("tar"), this, "createTargzProc"); // No tr
   createTargzProc->setCommunication( QProcess::Stdout );
   createTargzProc->setWorkingDirectory( QDir::rootDirPath() );
   connect( createTargzProc, SIGNAL( processExited() ), SLOT( targzDone() ) );
 
   retrieveTargzProc = new QProcess( this, "retrieveTargzProc" );
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
@@ -436,18 +436,18 @@ bool LoopControl::init( const QString& filename ) {
             DecodeLoopDebug(( "Cannot seek to frame" ));
         }
 
     }
 
     current_frame = 0;
     prev_frame = -1;
 
-    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) ) );
 
     audioMutex->unlock();
 
     return TRUE;
 }
 
 
 void LoopControl::play() {
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
@@ -576,18 +576,18 @@ bool LoopControl::init( const QString& filename ) {
 
     }
 
     videoMutex->lock();
     current_frame = 0;
     prev_frame = -1;
     videoMutex->unlock();
 
-    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) ) );
 
     //setBackgroundColor( black );
     return TRUE;
 }
 
 
 void LoopControl::play() {
 
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
@@ -37,18 +37,18 @@ extern MediaPlayerState *mediaPlayerState;
 
 
 MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
 
 //    QPEApplication::grabKeyboard();
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
-    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() ) );
     connect( mediaPlayerState, SIGNAL( prev() ),     this, SLOT( prev() ) );
 
     connect( audioUI,  SIGNAL( moreClicked() ),         this, SLOT( startIncreasingVolume() ) );
     connect( audioUI,  SIGNAL( lessClicked() ),         this, SLOT( startDecreasingVolume() ) );
     connect( audioUI,  SIGNAL( moreReleased() ),        this, SLOT( stopChangingVolume() ) );
     connect( audioUI,  SIGNAL( lessReleased() ),        this, SLOT( stopChangingVolume() ) );
 }
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
@@ -114,18 +114,18 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     d->current = NULL;
     fromSetDocument = FALSE;
     insanityBool=FALSE;
     audioScan = FALSE;
     videoScan = FALSE;
 //    menuTimer = new QTimer( this ,"menu timer"),
 //     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
     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&)) );
 
     setBackgroundMode( PaletteButton );
 
     setCaption( tr("OpiePlayer") );
     setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) );
 
     setToolBarsMovable( FALSE );
 
@@ -145,17 +145,17 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     tbDeletePlaylist->setFlat(TRUE);
 
     tbDeletePlaylist->setFixedSize(20,20);
     
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist",
                                       this , SLOT(addSelected()) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
                                           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",
                                    this , SLOT( btnPlay(bool) ), TRUE );
     d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle",
                                    mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
     d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop",
                                    mediaPlayerState, SLOT(setLooping(bool)), TRUE );
     tbDeletePlaylist->hide();
 
@@ -179,18 +179,18 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     fullScreenButton->addTo(pmView);
     scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0);
     scaleButton->addTo(pmView);
 
 
     skinsMenu = new QPopupMenu( this );
     menu->insertItem( tr( "Skins" ), skinsMenu );
     skinsMenu->isCheckable();
-    connect( skinsMenu, SIGNAL( activated( int ) ) ,
-             this, SLOT( skinsMenuActivated( int ) ) );
+    connect( skinsMenu, SIGNAL( activated(int) ) ,
+             this, SLOT( skinsMenuActivated(int) ) );
     populateSkinsMenu();
 
     QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
     QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
 
     QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
     
     tabWidget = new QTabWidget( hbox6, "tabWidget" );
@@ -291,48 +291,48 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     layoutL->addMultiCellWidget( playLists, 0, 0, 0, 1 );
 
     tabWidget->insertTab(LTab,tr("Lists"));
 
     connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
     connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) );
     connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) );
 
-    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)) );
 
 
 ///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*) ) );
 
 
 //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&) ) );
 
     connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
 
-    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*) ) );
 
     setCentralWidget( vbox5 );
 
     Config cfg( "OpiePlayer" );
     readConfig( cfg );
 
     currentPlayList = cfg.readEntry("CurrentPlaylist","default");
     loadList(DocLnk( currentPlayList));
@@ -935,17 +935,17 @@ void PlayListWidget::listDelete() {
       //           file = videoView->selectedItem()->text(0);
       //           for ( int i = 0; i < noOfFiles; i++ ) {
       //               QString entryName;
       //               entryName.sprintf( "File%i", i + 1 );
       //               QString linkFile = cfg.readEntry( entryName );
       //                   AppLnk lnk( AppLnk(linkFile));
       //               if( lnk.name() == file ) {
       //                   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();
       //                   prop.exec();
       //               }
       //            }
    }
    break;
    };
 }
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
@@ -10,18 +10,18 @@ using namespace OpieObex;
 
 /* TRANSLATOR OpieObex::ObexHandler */
 
 ObexHandler::ObexHandler() {
     m_wasRec = false;
     m_sender = 0l;
     m_receiver = 0l;
     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&) ) );
 }
 ObexHandler::~ObexHandler() {
     delete m_sender;
     delete m_receiver;
 }
 void ObexHandler::doSend(const QString& str, const QString& desc) {
     delete m_sender;
     m_sender = new SendWidget;
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
@@ -21,26 +21,26 @@ SendWidget::SendWidget( QWidget* parent, const char* name )
 SendWidget::~SendWidget() {
 }
 void SendWidget::initUI() {
     m_obex = new Obex(this, "obex");
     connect(m_obex, SIGNAL(error(int) ),
             this, SLOT(slotIrError(int) ) );
     connect(m_obex, SIGNAL(sent(bool) ),
             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&) ) );
 
     QVBoxLayout* lay = new QVBoxLayout(this);
 
     QHBox* nameBox = new QHBox(this);
     QLabel* name = new QLabel(nameBox);
     name->setText( tr("<qt><h1>Sending:</h1></qt>") );
     name->setAlignment( AlignLeft | AlignTop );
     m_lblFile = new QLabel(nameBox);
@@ -53,18 +53,18 @@ void SendWidget::initUI() {
 
     QLabel* devices = new QLabel(this);
     devices->setText("<qt><b>Devices:</b></qt>");
     devices->setAlignment( AlignLeft | AlignTop );
     lay->addWidget( devices,10 );
 
     m_devBox = new DeviceBox(this);
     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) ) );
 
     QPushButton *but = new QPushButton(this);
     but->setText(tr("Done") );
     connect(but, SIGNAL(clicked() ),
             this, SLOT(slotDone() ) );
 
     lay->addWidget( but );
     m_lay = lay;
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
@@ -19,18 +19,18 @@
 #include "receiver.h"
 
 using namespace OpieObex;
 
 /* TRANSLATOR OpieObex::Receiver */
 
 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();
 }
 Receiver::~Receiver() {
     m_obex->setReceiveEnabled( false );
     delete m_obex;
 }
 void Receiver::slotReceived( const QString& _file ) {
     QString file = _file;
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
@@ -52,37 +52,37 @@
 #include "inputmethods.h"
 
 using namespace Opie;
 
 
 LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
 {
         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 );
 
         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&)));         
 
         QHBoxLayout *lay = new QHBoxLayout ( m_taskbar, 4, 4 );
         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 );
         lay-> addStretch ( 10 );
 
         setActiveWindow ( );
         m_password-> setFocus ( );
 
         m_user-> insertStringList ( lApp-> allUsers ( ));
         
         //there is no point in displaying the IM for a zaurus
                 if (ODevice::inst ( )-> series ( ) != Model_Zaurus){
-                QTimer::singleShot ( 0, this, SLOT( showIM ( )));
+                QTimer::singleShot ( 0, this, SLOT( showIM()));
                 }
 
         QString opiedir = ::getenv ( "OPIEDIR" );
         QPixmap bgpix ( opiedir + "/pics/launcher/opie-background.jpg" );
 
         if ( !bgpix. isNull ( )) {
                 setBackgroundPixmap ( bgpix );
                 m_caption-> setBackgroundPixmap ( bgpix);
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
@@ -166,17 +166,17 @@ int main ( int argc, char **argv )
 
                                 const char *sig = ::strsignal ( killedbysig );
                                 QLabel *l = new QLabel ( 0, "sig", Qt::WStyle_Customize | Qt::WStyle_NoBorder | Qt::WStyle_Tool );
                                 l-> setText ( LoginWindowImpl::tr( "Opie was terminated\nby an uncaught signal\n(%1)\n" ). arg ( sig ));
                                 l-> setAlignment ( Qt::AlignCenter );
                                 l-> move ( 0, 0 );
                                 l-> resize ( app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
                                 l-> show ( );
-                                QTimer::singleShot ( 3000, app, SLOT( quit ( )));
+                                QTimer::singleShot ( 3000, app, SLOT( quit()));
                                 app-> exec ( );
                                 delete app;
                                 qApp = 0;
                         }
                 }
                 else {
                         if ( !autolog ) {
                 QString confFile=QPEApplication::qpeDir() + "/etc/opie-login.conf";
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
@@ -122,17 +122,17 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name
           columnVisible( true ),
           countNested( 0 )
 {
                 //qWarning("C'tor start");
 
         setSelectionMode( NoSelection );
         init();
         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)) );
 
         // contactList.clear();
                 //qWarning("C'tor end");
 }
 
 AbTable::~AbTable()
 {
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
@@ -72,20 +72,20 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         m_viewStack -> addWidget( tableBox , TableView );
 
         // Create CardView and add it to WidgetStack
          QVBox* cardBox = new QVBox( m_viewStack );
         m_ablabel = new AbLabel( cardBox, "CardView");
         m_viewStack -> addWidget( cardBox , CardView );
 
         // 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) ) );
 
         load();
 }
 
 AbView::~AbView()
 {
         m_contactdb -> save();
         delete m_contactdb;
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
@@ -130,18 +130,18 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         a->addTo( edit );
         a->addTo( listTools );
 
 
         // make it possible to go directly to businesscard via qcop call
         //#if defined(Q_WS_QWS) // Why this ? (se)
 #if !defined(QT_NO_COP)
         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
         // #endif
         a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
                          QString::null, 0, this, 0 );
         actionFind = a;
         connect( a, SIGNAL(activated()), this, SLOT( slotFindOpen()) );
         a->addTo( edit );
         a->addTo( listTools );
@@ -151,18 +151,18 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         searchBar->setHorizontalStretchable( TRUE );
         searchBar->hide();
         searchEdit = new QLineEdit( searchBar, "searchEdit" );
 
         // QFont f("unifont", 16 /*, QFont::Bold*/);
         // searchEdit->setFont( f );
 
         searchBar->setStretchableWidget( searchEdit );
-        connect( searchEdit, SIGNAL( returnPressed( ) ),
-                 this, SLOT( slotFind( ) ) );
+        connect( searchEdit, SIGNAL( returnPressed() ),
+                 this, SLOT( slotFind() ) );
 
         a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
         a->addTo( searchBar );
 
         a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
         connect( a, SIGNAL( activated() ), this, SLOT( slotFindClose() ) );
         a->addTo( searchBar );
@@ -221,18 +221,18 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
         // Create Views
         listContainer = new QWidget( this );
         QVBoxLayout *vb = new QVBoxLayout( listContainer );
 
          m_abView = new AbView( listContainer, m_config.orderList() );
          vb->addWidget( m_abView );
         // abList->setHScrollBarMode( QScrollView::AlwaysOff );
-        connect( m_abView, SIGNAL( signalViewSwitched ( int ) ),
-                 this, SLOT( slotViewSwitched( int ) ) );
+        connect( m_abView, SIGNAL( signalViewSwitched(int) ),
+                 this, SLOT( slotViewSwitched(int) ) );
 
 
         QObject::connect( m_abView, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
 
         // m_abView->load(); // Already done by c'tor .
 
         // Letter Picker
         pLabel = new LetterPicker( listContainer );
@@ -249,18 +249,18 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
          slotSetFont(m_config.fontSize());
         m_curFontSize = m_config.fontSize();
 
         setCentralWidget(listContainer);
 
         //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
         connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
         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&) ) );
 
 
         isLoading = false;
 }
 
 
 void AddressbookWindow::slotConfig()
 {
@@ -590,17 +590,17 @@ void AddressbookWindow::slotBeam()
                 delete access;
 
                 beamFilename = beamfile;
         }
 
         qWarning("Beaming: %s", beamFilename.latin1() );
 
         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();
         ir->send( beamFilename, description, "text/x-vCard" );
 }
 
 void AddressbookWindow::beamDone( Ir *ir )
 {
 
         delete ir;
@@ -668,17 +668,17 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 // :SXm_abView()->init( cnt );
                 editEntry( EditEntry );
         } else if ( msg == "beamBusinessCard()" ) {
                 QString beamFilename = addressbookPersonalVCardName();
                 if ( !QFile::exists( beamFilename ) )
                         return; // can't beam a non-existent file
 
                 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";
                 ir->send( beamFilename, description, "text/x-vCard" );
         } else if ( msg == "show(int)" ) {
                 raise();
                 QDataStream stream(data,IO_ReadOnly);
                 int uid;
                 stream >> uid;
 
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
@@ -530,18 +530,18 @@ void ContactEditor::init() {
         birthdayButton->setPopupDelay(0);
 
         QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
                                                      tr( "Delete" ),
                                                      hBox, 0 );
 
         gl->addWidget( hBox, counter , 1  );
 
-        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() ) );
 
         ++counter;
 
         // Anniversary
         hBox = new QHBox( container );
         l = new QLabel( tr("Anniversary"), container );
         gl->addWidget( l, counter, 0 );
@@ -554,18 +554,18 @@ void ContactEditor::init() {
          anniversaryButton->setPopup( m1 );
         anniversaryButton->setPopupDelay(0);
 
         deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
                                                      tr( "Delete" ),
                                                      hBox, 0 );
         gl->addWidget( hBox, counter , 1  );
 
-        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() ) );
 
         ++counter;
 
         // Gender
         l = new QLabel( tr("Gender"), container );
         gl->addWidget( l, counter, 0 );
         cmbGender = new QComboBox( container );
@@ -639,42 +639,42 @@ void ContactEditor::init() {
         cmbChooserField4->insertStringList( trlChooserNames );
 
          cmbChooserField1->setCurrentItem( 0 );
          cmbChooserField2->setCurrentItem( 1 );
          cmbChooserField3->setCurrentItem( 2 );
 
         connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
 
-        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)),
                  this, SLOT(slotCmbChooser1Change(int)) );
         connect( cmbChooserField2, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser2Change(int)) );
         connect( cmbChooserField3, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser3Change(int)) );
         connect( cmbChooserField4, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser4Change(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
@@ -156,26 +156,26 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
                 if(defaultView==WEEK) needEvilHack=true;// viewWeek();
         if(defaultView==WEEKLST) viewWeekLst();
         if(defaultView==MONTH) viewMonth();
 
         connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) );
         connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(changeWeek(bool)) );
 
 #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
 
     // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
         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
 #endif
 
         qDebug("done t=%d", t.elapsed() );
 
         connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
         connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
     /*
@@ -512,31 +512,31 @@ void DateBook::initDay()
         if ( !dayView ) {
                 dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
                 views->addWidget( dayView, DAY );
                 dayView->setJumpToCurTime( bJumpToCurTime );
                 dayView->setStartViewTime( startTime );
                 dayView->setRowStyle( rowStyle );
                 connect( this, SIGNAL( newEvent() ), dayView, SLOT( redraw() ) );
                         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&)) );
         }
 }
 
 void DateBook::initWeek()
 {
         if ( !weekView ) {
                 weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
                 weekView->setStartViewTime( startTime );
                 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() ) );
         }
 
         //But also get it right: the year that we display can be different
         //from the year of the current date. So, first find the year
         //number of the current week.
         int yearNumber, totWeeks;
         calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
@@ -551,31 +551,31 @@ void DateBook::initWeek()
 }
 
 void DateBook::initWeekLst() {
         if ( !weekLstView ) {
                 weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" );
                 views->addWidget( weekLstView, WEEKLST );
 
                 //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&) ) );
         }
 }
 
 
 void DateBook::initMonth()
 {
         if ( !monthView ) {
                 monthView = new DateBookMonth( views, "month view", FALSE, db );
                 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() ) );
                 qApp->processEvents();
         }
 }
 
 void DateBook::loadSettings()
 {
         Config qpeconfig( "qpe" );
@@ -900,17 +900,17 @@ static const char * beamfile = "/tmp/obex/event.vcs";
 
 void DateBook::beamEvent( const Event &e )
 {
     qDebug("trying to beamn");
     unlink( beamfile ); // delete if exists
     mkdir("/tmp/obex/", 0755);
     Event::writeVCalendar( beamfile, 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();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void DateBook::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
@@ -919,21 +919,19 @@ void DateBook::beamDone( Ir *ir )
 void DateBook::slotFind()
 {
     // move it to the day view...
     viewDay();
     FindDialog frmFind( "Calendar", this ); // no tr needed
     frmFind.setUseDate( true );
     frmFind.setDate( currentDate() );
     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,
                       SIGNAL(signalNotFound()),
                       &frmFind,
                       SLOT(slotNotFound()) );
     QObject::connect( this,
                       SIGNAL(signalWrapAround()),
                       &frmFind,
                       SLOT(slotWrapAround()) );
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
@@ -203,17 +203,17 @@ DateBookDayViewQuickLineEdit::DateBookDayViewQuickLineEdit(const QDateTime &star
         quickEvent.setEnd(end);
         connect(this,SIGNAL(returnPressed()),this,SLOT(slotReturnPressed()));
 }
 
 void DateBookDayViewQuickLineEdit::slotReturnPressed()
 {
                 if(active && (!this->text().isEmpty())) {// Fix to avoid having this event beeing added multiple times.
                 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));
                 active=0;
         }
         /* we need to return to this object.. */
                 QTimer::singleShot(500, this, SLOT(finallyCallClose())  );// Close and also delete this widget
 }
 void DateBookDayViewQuickLineEdit::finallyCallClose() {
     close(true); // also deletes this widget...
@@ -233,21 +233,21 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, QWid
         header = new DateBookDayHeader( startOnMonday, this, "day header" );
         header->setDate( currDate.year(), currDate.month(), currDate.day() );
 
         m_allDays = new DatebookdayAllday(newDb, this, "all day event list" );
         m_allDays->hide();
 
         view = new DateBookDayView( ampm, this, "day view" );
 
-        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&)) );
 
         QTimer *timer = new QTimer( this );
 
                 connect( timer, SIGNAL(timeout()), this, SLOT(updateView()) );//connect timer for updating timeMarker & daywidgetcolors
         timer->start( 1000*60*5, FALSE ); //update every 5min
 
         selectedWidget = 0;
 
@@ -368,20 +368,20 @@ void DateBookDay::getEvents()
                         if (!object)
                             continue;
                     }else {
                         DateBookDayWidget* w = new DateBookDayWidget( *it, this );
                         widgetList.append( w );
                         object = w;
                     }
 
-                    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&) ) );
 
                 }
         }
 }
 
 static int place( const DateBookDayWidget *item, bool *used, int maxn )
 {
         int place = 0;
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
@@ -55,17 +55,17 @@ DatebookdayAllday::~DatebookdayAllday()
 DatebookAlldayDisp* DatebookdayAllday::addEvent(const EffectiveEvent&ev)
 {
     DatebookAlldayDisp * lb;
     lb = new DatebookAlldayDisp(dateBook,ev,m_MainFrame,NULL);
     lb->show();
     datebookdayalldayLayout->addWidget(lb);
     subWidgets.append(lb);
 
-    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;
 
     return lb;
 }
 
 void DatebookdayAllday::removeAllEvents()
 {
     subWidgets.clear();
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
@@ -91,18 +91,18 @@ void DateBookDayHeader::setupNames()
 void DateBookDayHeader::pickDate()
 {
     static QPopupMenu *m1 = 0;
     static DateBookMonth *picker = 0;
     if ( !m1 ) {
         m1 = new QPopupMenu( this );
         picker = new DateBookMonth( m1, 0, TRUE );
         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() ) );
     }
     picker->setDate( currDate.year(), currDate.month(), currDate.day() );
     m1->popup(mapToGlobal(date->pos()+QPoint(0,date->height())));
     picker->setFocus();
 }
 
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
@@ -26,17 +26,17 @@
 #include <qcheckbox.h>
 
 DateBookSettings::DateBookSettings( bool whichClock, QWidget *parent,
                                     const char *name, bool modal, WFlags fl )
     : DateBookSettingsBase( parent, name, modal, fl ),
       ampm( whichClock )
 {
         init();
-        QObject::connect( qApp, SIGNAL( clockChanged( bool ) ), this, SLOT( slotChangeClock( bool ) ) );
+        QObject::connect( qApp, SIGNAL( clockChanged(bool) ), this, SLOT( slotChangeClock(bool) ) );
         QArray<int> categories;
         comboCategory->setCategories( categories, "Calendar", tr("Calendar") );
 }
 
 DateBookSettings::~DateBookSettings()
 {
 }
 
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
@@ -357,20 +357,20 @@ DateBookWeek::DateBookWeek( bool ap, bool startOnMonday, DateBookDB *newDB,
 
         lblDesc = new QLabel( this, "event label" );
         lblDesc->setFrameStyle( QFrame::Plain | QFrame::Box );
         lblDesc->setBackgroundColor( yellow );
         lblDesc->hide();
 
         tHide = new QTimer( this );
 
-        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() ) );
         connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) );
         connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotClockChanged(bool)));
         setDate(QDate::currentDate());
 }
 
 void DateBookWeek::keyPressEvent(QKeyEvent *e)
 {
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
@@ -51,17 +51,17 @@ DateBookWeekHeader::~DateBookWeekHeader()
 void DateBookWeekHeader::pickDate()
 {
         static QPopupMenu *m1 = 0;
         static DateBookMonth *picker = 0;
         if ( !m1 ) {
                 m1 = new QPopupMenu( this );
                 picker = new DateBookMonth( m1, 0, TRUE );
                 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() ) );
         }
         picker->setDate( date.year(), date.month(), date.day() );
         m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
         picker->setFocus();
 }
 
 void DateBookWeekHeader::nextMonth()
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
@@ -67,17 +67,17 @@ void DateBookWeekLstHeader::setDate(const QDate &d) {
 
 void DateBookWeekLstHeader::pickDate() {
         static QPopupMenu *m1 = 0;
         static DateBookMonth *picker = 0;
         if ( !m1 ) {
                 m1 = new QPopupMenu( this );
                 picker = new DateBookMonth( m1, 0, TRUE );
                 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() ) );
         }
         picker->setDate( date.year(), date.month(), date.day() );
         m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
         picker->setFocus();
 }
 void DateBookWeekLstHeader::setDate(int y, int m, int d) {
@@ -230,26 +230,26 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
         int dayoffset=d.dayOfWeek();
         if(bStartOnMonday) dayoffset--;
         else if( dayoffset == 7 ) dayoffset = 0;
 
         for (int i=0; i<7; i++) {
         // Header
                 DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i-dayoffset), bStartOnMonday,this);
                 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);
 
                 // Events
                 while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
                                 if(!(((*it).end().hour()==0) && ((*it).end().minute()==0) && ((*it).startDate()!=(*it).date()))) {// Skip events ending at 00:00 starting at another day.
                                 DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,weeklistviewconfig,this);
                                 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&)));
                         }
                         it++;
                 }
                 layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
     }
 }
 DateBookWeekLstView::~DateBookWeekLstView(){}
 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
@@ -260,28 +260,28 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
                                                QWidget* parent,
                                                const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
         QHBoxLayout *layout = new QHBoxLayout( this );
 
         DateBookWeekLstView *w=new DateBookWeekLstView(ev1,d,onM,this);
         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&)));
 
 
         w=new DateBookWeekLstView(ev2,d.addDays(7),onM,this);
         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&)));
 }
 
 DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
                                   QWidget *parent,
                                   const char *name )
     : QWidget( parent, name ),
       db( newDB ),
       startTime( 0 ),
@@ -289,17 +289,17 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
       bStartOnMonday(onM)
 {
         setFocusPolicy(StrongFocus);
         layout = new QVBoxLayout( this );
         layout->setMargin(0);
 
         header=new DateBookWeekLstHeader(onM, this);
         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)));
 
         scroll=new QScrollView(this);
         scroll->setResizePolicy(QScrollView::AutoOneFit);
         layout->addWidget(scroll);
 
         view=NULL;
         Config config("DateBook");
@@ -353,20 +353,20 @@ void DateBookWeekLst::getEvents() {
                 QDate start2=start.addDays(7);
                 stop=start2.addDays(6);
                 QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
                 view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
         } else {
                 view=new DateBookWeekLstView(el,start,bStartOnMonday,scroll);
         }
 
-        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&)));
 
         scroll->addChild(view);
         view->show();
         scroll->updateScrollBars();
 }
 
 void DateBookWeekLst::dateChanged(QDate &newdate) {
         bdate=newdate;
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
@@ -185,39 +185,39 @@ void DateEntry::init()
     comboDescription->setInsertionPolicy(QComboBox::AtCurrent);
     comboLocation->setInsertionPolicy(QComboBox::AtCurrent);
 
     initCombos();
     QPopupMenu *m1 = new QPopupMenu( this );
     startPicker = new DateBookMonth( m1, 0, TRUE );
     m1->insertItem( startPicker );
     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)),
              this, SLOT(slotChangeStartOfWeek(bool)) );
 
     connect( editNote, SIGNAL(clicked()),
              this, SLOT(slotEditNote()) );
 
     QPopupMenu *m2 = new QPopupMenu( this );
     endPicker = new DateBookMonth( m2, 0, TRUE );
     m2->insertItem( endPicker );
     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
     comboEnd->installEventFilter( this );
     comboStart->installEventFilter( this );
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
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
@@ -354,18 +354,18 @@ void RepeatEntry::setupYearly()
 void RepeatEntry::init()
 {
     QPopupMenu *m1 = new QPopupMenu( this );
     repeatPicker = new DateBookMonth( m1, 0, TRUE );
     m1->insertItem( repeatPicker );
     cmdEnd->setPopup( m1 );
     cmdEnd->setPopupDelay( 0 );
 
-    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)),
                       this, SLOT(slotChangeStartOfWeek(bool)) );
 
     listRTypeButtons.setAutoDelete( TRUE );
     listRTypeButtons.append( cmdNone );
     listRTypeButtons.append( cmdDay );
     listRTypeButtons.append( cmdWeek );
     listRTypeButtons.append( cmdMonth );
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
@@ -29,22 +29,22 @@ MainWindow::MainWindow()
     initUI();
     initManagers();
     initView();
     initConfig();
 
     QTimer::singleShot(0, this, SLOT(populate() ) );
 
     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&) ) );
 }
 MainWindow::~MainWindow() {
     m_tempMan.save();
     m_locMan.save();
     m_descMan.save();
 
     manager()->save();
     delete m_manager;
@@ -145,18 +145,18 @@ void MainWindow::initUI() {
     a->addTo( m_popSetting );
     connect(a, SIGNAL( activated() ), this, SLOT(slotConfigureTemp() ) );
 
     connect( qApp, SIGNAL(clockChanged(bool) ),
              this, SLOT(slotClockChanged(bool) ) );
     connect( qApp, SIGNAL(weekChanged(bool) ),
              this, SLOT(slotWeekChanged(bool) ) );
 
-    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&) ) );
 }
 void MainWindow::initConfig() {
 
 }
 void MainWindow::initView() {
 
 }
 void MainWindow::initManagers() {
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
@@ -196,17 +196,17 @@ void MainWindow::makeMenu()
   //image ripped of off opie-login/loginwindow.cpp
   QPixmap image1( ( const char** ) image1_data );
 
   //Clear text
   ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
   ClearSearchText->setText( tr( "" ) );
   ClearSearchText->setPixmap( image1 );
 
-  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() ) );
 
 }
 
 MainWindow::~MainWindow()
 {
    Config cfg( "osearch", Config::User );
    cfg.setGroup( "search_settings" );
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
@@ -32,18 +32,18 @@ AddressBookPluginWidget::AddressBookPluginWidget( QWidget *parent,  const char*
 
     // Hä ? Nonsense ! (se)
     if ( m_contactdb ) {
         delete m_contactdb;
     }
 
     m_contactdb = new OContactAccess("addressplugin");
     
-    connect( m_contactdb, SIGNAL( signalChanged( const OContactAccess * ) ),
-             this, SLOT( refresh( const OContactAccess * ) ) );
+    connect( m_contactdb, SIGNAL( signalChanged(const OContactAccess*) ),
+             this, SLOT( refresh(const OContactAccess*) ) );
 
 
     readConfig();
     getAddress();
 }
 
 AddressBookPluginWidget::~AddressBookPluginWidget() {
     delete m_contactdb;
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
@@ -94,17 +94,17 @@ void DatebookPluginWidget::getDates() {
         for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it  != list.end(); ++it ) {
 
             if ( count < m_max_lines_meet ) {
                 if ( !m_onlyLater ) {
                     count++;
                     DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
                     m_eventsList.append( l );
                     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 {
                         if ( ( QDateTime::currentDateTime()  <=  (*it).event().end() )
                              // Show events which span over many days and are not elapsed.
                              || ( ( (*it).event().start().date() != date ) &&  (  QDateTime::currentDateTime()  <=  (*it).event().end() )  )
                              // Show repeated event for today that is not elapsed.
                              || ( ( (*it).event().repeatType() != Event::NoRepeat )
                                   && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() )
                                        && ( QTime::currentTime() < (*it).event().start().time() ) ) )
@@ -113,17 +113,17 @@ void DatebookPluginWidget::getDates() {
                                   && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) )
                              )
                              {
                                 count++;
                                 // show only later appointments
                                 DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine );
                                 m_eventsList.append( l );
                                 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&) ) );
                              }
                 }
             }
         }
         if ( m_onlyLater && count == 0 ) {
             QLabel* noMoreEvents = new QLabel( this );
             m_eventsList.append(  noMoreEvents );
             noMoreEvents->show();
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
@@ -35,18 +35,18 @@ MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
     }
     m_layout = new QHBoxLayout( this );
     m_layout->setAutoAdd( true );
 
 
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     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
 #endif
 
     readConfig();
     getInfo();
 }
 
 
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
@@ -48,18 +48,18 @@ Today::Today( QWidget* parent,  const char* name, WFlags fl )
     : TodayBase( parent, name, fl ) {
 
     QObject::connect( (QObject*)ConfigButton, SIGNAL( clicked() ), this, SLOT( startConfig() ) );
     QObject::connect( (QObject*)OwnerField, SIGNAL( clicked() ), this,  SLOT( editCard() ) );
 
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     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
 #endif
 
     setOwnerField();
     m_refreshTimer = new QTimer( this );
     connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
     m_refreshTimer->start( 15000 );
     m_big_box = 0L;
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
@@ -80,17 +80,17 @@ TodayConfig::TodayConfig( QWidget* parent, const char* name, bool modal )
 
     m_guiMisc = new TodayConfigMiscBase( tab_3 );
 
     tab3Layout->addWidget( m_guiMisc );
     TabWidget3->addTab( tab_3, "SettingsIcon", tr( "Misc" ) );
 
     m_applets_changed = false;
 
-    connect ( m_appletListView , SIGNAL( clicked ( QListViewItem * ) ), this, SLOT( appletChanged ( ) ) );
+    connect ( m_appletListView , SIGNAL( clicked(QListViewItem*) ), this, SLOT( appletChanged() ) );
 
     readConfig();
     QPEApplication::showDialog( this );
 }
 
 
 /**
  * Autostart, uses the new (opie only) autostart method in the launcher code.
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
@@ -184,17 +184,17 @@ void MainWindow::initActions() {
     a->addTo( m_options );
     a->setOn( showOverDue() );
     connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) );
 
     m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"),
                                         0, this, 0, TRUE );
     m_showDeadLineAction->addTo( m_options );
     m_showDeadLineAction->setOn( showDeadline() );
-    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) );
+    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine(bool) ) );
 
     m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"),
                                      0, this, 0, TRUE );
     m_showQuickTaskAction->addTo( m_options );
     m_showQuickTaskAction->setOn( showQuickTask() );
     connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) );
 
     m_options->insertSeparator();
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
@@ -78,13 +78,13 @@ void OTaskEditor::init() {
 
 
     /* signal and slots */
     connect(m_overView, SIGNAL(recurranceEnabled(bool) ),
             m_rec, SLOT(setEnabled(bool) ) );
 
     /* connect due date changed to the recurrence tab */
     connect(m_stat, SIGNAL(dueDateChanged(const QDate&) ),
-            m_rec, SLOT(setStartDate(const QDate& ) ) );
+            m_rec, SLOT(setStartDate(const QDate&) ) );
 
 
     m_tab->setCurrentTab( m_overView );
 }
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
@@ -111,24 +111,24 @@ TableView::TableView( MainWindow* window, QWidget* wid )
     setShowDeadline( todoWindow()->showDeadline() );
 
     setSorting( TRUE );
     setSelectionMode( NoSelection );
 
     setLeftMargin( 0 );
     verticalHeader()->hide();
 
-    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) ) );
 
     m_menuTimer = new QTimer( this );
     connect( m_menuTimer, SIGNAL(timeout()),
              this, SLOT(slotShowMenu()) );
 
     /* now let's init the config */
     initConfig();
 
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
@@ -74,18 +74,18 @@ TaskEditorAlarms::TaskEditorAlarms( QWidget* parent,  int, const char* name, WFl
     m_date = m_type = m_time = 0;
     QGridLayout *layout = new QGridLayout( this, 2, 2, 4, 4 );
 
     lstAlarms = new QListView( this );
     lstAlarms->addColumn( tr("Date") );
     lstAlarms->addColumn( tr("Time") );
     lstAlarms->addColumn( tr("Type") );
 
-    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) ) );
 
     layout->addMultiCellWidget( lstAlarms, 0, 0, 0, 2 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), this );
     //QWhatsThis::add( btn, tr( "Click here to add a new transaction." ) );
     connect( btn, SIGNAL( clicked() ), this, SLOT( slotNew() ) );
     layout->addWidget( btn, 1, 0 );
 /* use when we've reminders too */
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
@@ -95,50 +95,50 @@ TaskEditorStatus::TaskEditorStatus( QWidget* parent,  const char* name, WFlags f
     btnStart = new QPushButton( curDateStr, container );
     btnStart->setEnabled( FALSE );
     layout->addMultiCellWidget( btnStart, 2, 2, 1, 2 );
     QWhatsThis::add( btnStart, tr( "Click here to set the date this task was started." ) );
     QPopupMenu *popup = new QPopupMenu( this );
     m_startBook = new DateBookMonth( popup, 0, TRUE );
     popup->insertItem( m_startBook );
     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) ) );
 
     // Due date
     ckbDue = new QCheckBox( tr( "Due Date:" ), container );
     layout->addWidget( ckbDue, 3, 0 );
     QWhatsThis::add( ckbDue, tr( "Click here to set the date this task needs to be completed by." ) );
     connect( ckbDue, SIGNAL( clicked() ), this, SLOT( slotDueChecked() ) );
     btnDue = new QPushButton( curDateStr, container );
     btnDue->setEnabled( FALSE );
     layout->addMultiCellWidget( btnDue, 3, 3, 1, 2 );
     QWhatsThis::add( btnDue, tr( "Click here to set the date this task needs to be completed by." ) );
     popup = new QPopupMenu( this );
     m_dueBook = new DateBookMonth( popup, 0, TRUE );
     popup->insertItem( m_dueBook );
     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) ) );
 
     // Completed
     ckbComp = new QCheckBox( tr( "Completed:" ), container );
     layout->addWidget( ckbComp, 4, 0 );
     QWhatsThis::add( ckbComp, tr( "Click here to mark this task as completed." ) );
     connect( ckbComp, SIGNAL( clicked() ), this, SLOT( slotCompChecked() ) );
     btnComp = new QPushButton( curDateStr, container );
     btnComp->setEnabled( FALSE );
     layout->addMultiCellWidget( btnComp, 4, 4, 1, 2 );
     QWhatsThis::add( btnComp, tr( "Click here to set the date this task was completed." ) );
     popup = new QPopupMenu( this );
     m_compBook = new DateBookMonth( popup, 0, TRUE );
     popup->insertItem( m_compBook );
     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) ) );
 
     QSpacerItem *spacer = new QSpacerItem( 5, 5, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding );
     layout->addItem( spacer, 5, 0 );
 
     // Maintainer mode
 #if 0
     label = new QLabel( tr( "Maintainer Mode:" ), container );
     layout->addWidget( label, 6, 0 );
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
@@ -49,38 +49,38 @@ QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent ,
       desktopChannel( 0 ),
       cardChannel( 0 )
 {
     if ( !ok() )
         qWarning( "Failed to bind to port %d", port );
     else {
 #ifndef QT_NO_COP
         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
     }
     sendSync = FALSE;
 }
 
 QCopBridge::~QCopBridge()
 {
 #ifndef QT_NO_COP
     delete desktopChannel;
 #endif
 }
 
 void QCopBridge::newConnection( int socket )
 {
     QCopBridgePI *pi = new QCopBridgePI( socket, this );
     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
     QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
 #endif
 
     if ( sendSync ) {
         pi ->startSync();
         sendSync = FALSE;
     }
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
@@ -289,29 +289,29 @@ ServerPI::ServerPI( int socket, QObject *parent , const char* name )
                         wait[i] = FALSE;
 
                 send( "220 Qtopia " QPE_VERSION " FTP Server" );
                 state = Wait_USER;
 
                 dtp = new ServerDTP( this );
                 connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
                 connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
-                connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
+                connect( dtp, SIGNAL( error(int) ), SLOT( dtpError(int) ) );
 
 
                 directory = QDir::currentDirPath();
 
                 static int p = 1024;
 
                 while ( !serversocket || !serversocket->ok() ) {
                         delete serversocket;
                         serversocket = new ServerSocket( ++p, this );
                 }
-                connect( serversocket, SIGNAL( newIncomming( int ) ),
-                         SLOT( newConnection( int ) ) );
+                connect( serversocket, SIGNAL( newIncomming(int) ),
+                         SLOT( newConnection(int) ) );
         }
 }
 
 ServerPI::~ServerPI()
 {
 }
 
 void ServerPI::connectionClosed()
@@ -1041,32 +1041,32 @@ void ServerPI::timerEvent( QTimerEvent * )
 
 ServerDTP::ServerDTP( QObject *parent, const char* name)
                 : QSocket( parent, name ), mode( Idle ), createTargzProc( 0 ),
                 retrieveTargzProc( 0 ), gzipProc( 0 )
 {
 
         connect( this, SIGNAL( connected() ), SLOT( connected() ) );
         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() ) );
 
         gzipProc = new OProcess( this, "gzipProc" );
 
         createTargzProc = new OProcess( QString("tar"), this, "createTargzProc");
         createTargzProc->setWorkingDirectory( QDir::rootDirPath() );
-        connect( createTargzProc, SIGNAL( processExited(OProcess *) ), SLOT( targzDone() ) );
+        connect( createTargzProc, SIGNAL( processExited(OProcess*) ), SLOT( targzDone() ) );
 
         QStringList args = "tar";
         args += "-xv";
         retrieveTargzProc = new OProcess( args, this, "retrieveTargzProc" );
         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() ) );
 }
 
 ServerDTP::~ServerDTP()
 {
         buf.close();
         file.close();
         createTargzProc->kill();
@@ -1276,26 +1276,26 @@ void ServerDTP::readyRead()
 void ServerDTP::writeTargzBlock(OProcess *, char *buffer, int buflen)
 {
         writeBlock( buffer, buflen );
         qDebug("writeTargzBlock %d", buflen);
         if ( !createTargzProc->isRunning() ) {
                 qDebug("tar and gzip done");
                 emit completed();
                 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) ) );
         }
 }
 
 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();
 }
 
 void ServerDTP::gzipTarBlock(OProcess *, char *buffer, int buflen)
 {
         //qDebug("gzipTarBlock");
         if ( !gzipProc->isRunning() ) {
                 //qDebug("auto start gzip proc");
@@ -1333,32 +1333,32 @@ void ServerDTP::sendGzipFile( const QString &fn,
 
         QStringList args = "tar";
         args += "-cv";
         args += archiveTargets;
         qDebug("sendGzipFile %s", args.join(" ").latin1() );
         createTargzProc->clearArguments( );
         *createTargzProc << args;
         connect( createTargzProc,
-                 SIGNAL( receivedStdout(OProcess *, char *, int) ), SLOT( gzipTarBlock(OProcess *, char *, int) ) );
+                 SIGNAL( receivedStdout(OProcess*,char*,int) ), SLOT( gzipTarBlock(OProcess*,char*,int) ) );
 
         gzipProc->clearArguments( );
         *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) ) );
 }
 
 void ServerDTP::gunzipDone()
 {
         qDebug("gunzipDone");
         disconnect( gzipProc, SIGNAL( processExited() ),
                     this, SLOT( 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) ) );
 }
 
 void ServerDTP::tarExtractBlock(OProcess *, char *buffer, int buflen)
 {
         qDebug("tarExtractBlock");
         if ( !retrieveTargzProc->isRunning() ) {
                 qDebug("auto start ungzip proc");
                 if ( !retrieveTargzProc->start(OProcess::NotifyOnExit, OProcess::Stdin) )
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
@@ -131,17 +131,17 @@ ButtonSettings::ButtonSettings ( QWidget *parent , const char *name,  bool modal
         }
 
         toplay-> addStretch ( 10 );
 
         m_last_button = 0;
         m_lock = false;
 
         m_timer = new QTimer ( this );
-        connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( keyTimeout ( )));
+        connect ( m_timer, SIGNAL( timeout()), this, SLOT( keyTimeout()));
 
         updateLabels ( );
 
         QPEApplication::grabKeyboard ( );
 }
 
 ButtonSettings::~ButtonSettings ( )
 {
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
@@ -74,17 +74,17 @@ RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, c
   QListViewItem *it = new NoSortItem ( w_list, 3, tr( "Actions" )); 
   ButtonUtils::inst ( )-> insertActions ( it );
   it-> setOpen ( true );
   
   m_map_show = new NoSortItem ( w_list, 4, tr( "Show" )); 
   
   w_list-> setCurrentItem ( m_current );
   
-  QTimer::singleShot ( 0, this, SLOT( delayedInit ( )));
+  QTimer::singleShot ( 0, this, SLOT( delayedInit()));
 }
 
 RemapDlg::~RemapDlg ( )
 {
 }
 
 void RemapDlg::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
@@ -104,18 +104,18 @@ CityTime::CityTime( QWidget *parent, const char* name,
     }
 
     selWidget = frmMap->selectionWidget( this );
     selWidget->hide();
     CityTimeBaseLayout->addWidget( selWidget );
     bAdded = true;
     readInTimes();
     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
     timerEvent( 0 );
 }
 
 CityTime::~CityTime()
 {
     if ( changed ) {
         Config cfg("CityTime");
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
@@ -225,17 +225,17 @@ CityTimeBase::CityTimeBase( QWidget* parent,  const char* name, WFlags  )
     cmdCity9->setText( tr( "" ) );
     cmdCity9->setToggleButton( TRUE );
     cmdCity9->setToggleButton( TRUE );
 
     Layout2->addWidget( cmdCity9, 2, 2 );
     CityTimeBaseLayout->addWidget( buttonWidget );
 
     // 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) ) );
     connect( cmdCity1, SIGNAL( toggled(bool) ), cmdCity3, SLOT( setDisabled(bool) ) );
     connect( cmdCity1, SIGNAL( toggled(bool) ), cmdCity4, SLOT( setDisabled(bool) ) );
     connect( cmdCity1, SIGNAL( toggled(bool) ), cmdCity7, SLOT( setDisabled(bool) ) );
     connect( cmdCity1, SIGNAL( toggled(bool) ), cmdCity8, SLOT( setDisabled(bool) ) );
     connect( cmdCity2, SIGNAL( toggled(bool) ), cmdCity1, SLOT( setDisabled(bool) ) );
     connect( cmdCity2, SIGNAL( toggled(bool) ), cmdCity3, SLOT( setDisabled(bool) ) );
     connect( cmdCity2, SIGNAL( toggled(bool) ), cmdCity4, 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
@@ -182,22 +182,22 @@ ZoneMap::ZoneMap( QWidget *parent, const char* name )
                       lblCity, SLOT( hide() ) );
     QObject::connect( tHide, SIGNAL( timeout() ),
                       this, SLOT( slotRedraw() ) );
     QTimer *tUpdate = new QTimer( this, "Update Timer" );
     QObject::connect( tUpdate, SIGNAL( timeout() ),
                       this, SLOT( slotUpdate() ) );
     QObject::connect( qApp, SIGNAL( timeChanged() ),
                       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
     tUpdate->start( 5 * 60 * 1000 );
     // May as well read in the timezone information too...
     readZones();
 }
 
 ZoneMap::~ZoneMap()
 {
@@ -461,17 +461,17 @@ QWidget* ZoneMap::selectionWidget( QWidget *parent) {
 
     QWidget *returnWidget = new QWidget( parent );
 
     QVBoxLayout *layout = new QVBoxLayout( returnWidget );
     QHBox *hBox = new QHBox( returnWidget );
     QListView *continentView = new QListView( hBox );
     continentView->addColumn( tr("Continent") );
     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*) ) );
 
     QStringList continentList;
     QListIterator<ZoneField> itZone( zones );
     for ( itZone.toFirst(); itZone.current(); ++itZone ) {
         ZoneField *pZone = itZone.current();
         if ( continentList.contains( pZone->country() ) == 0 ) {
             QString name;
             QListViewItem *item;
@@ -497,17 +497,17 @@ void ZoneMap::slotGetCities( QListViewItem * contItem) {
     cityView->clear();
     selectedCont = contItem->text( 1 );
     QListIterator<ZoneField> itZone( zones );
     for ( itZone.toFirst(); itZone.current(); ++itZone ) {
         ZoneField *pZone = itZone.current();
         if ( pZone->country() == contItem->text( 1 ) ) {
             QListViewItem *item;
             item = new QListViewItem( cityView, pZone->city() );
-            connect ( cityView, SIGNAL( clicked ( QListViewItem* ) ), this, SLOT( slotCitySelected( QListViewItem* ) ) );
+            connect ( cityView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( slotCitySelected(QListViewItem*) ) );
         }
     }
 }
 
 void ZoneMap::slotCitySelected( QListViewItem *cityItem ) {
     if ( cityItem ) {
         emit signalTz( selectedCont, cityItem->text( 0 ) );
     }
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
@@ -65,17 +65,17 @@ MenuSettings::MenuSettings ( QWidget *parent, const char *name )
         lay-> addWidget ( m_menutabs );
 
         m_menusubpopup = new QCheckBox ( tr( "Show Applications in Subpopups" ), this );
         lay-> addWidget ( m_menusubpopup );
 
         QWhatsThis::add ( m_list, tr( "Check the applets that you want to have included in the O-Menu." ));
         QWhatsThis::add ( m_menutabs, tr( "Adds the contents of the Launcher Tabs as menus in the O-Menu." ));
 
-        connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
+        connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged()));
 
         init ( );
 }
 
 void MenuSettings::init ( )
 {
         Config cfg ( "StartMenu" );
         cfg. setGroup ( "Applets" );
@@ -119,17 +119,17 @@ void MenuSettings::init ( )
                         delete lib;
                 }
         }
 
         cfg. setGroup ( "Menu" );
         m_menutabs->setChecked( cfg.readBoolEntry( "LauncherTabs", true ) );
         m_menusubpopup->setChecked( cfg.readBoolEntry( "LauncherSubPopup", true ) );
         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) ) );
 
 }
 
 void MenuSettings::appletChanged()
 {
         m_applets_changed = true;
 }
 
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
@@ -314,19 +314,19 @@ QWidget *TabDialog::createFontTab ( QWidget *parent )
     QVBoxLayout *vertLayout = new QVBoxLayout ( tab, 3, 3 );
 
         m_fontuse = new QCheckBox ( tr( "Use a custom font" ), tab );
         vertLayout-> addWidget ( m_fontuse );
 
     m_fontselect = new OFontSelector ( false, tab, "fontsel" );
     vertLayout-> addWidget ( m_fontselect );
 
-        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&)));
 
     return tab;
 }
 
 QWidget *TabDialog::createBgTab ( QWidget *parent )
 {
     QWidget *tab = new QWidget( parent, "BgTab" );
     QVBoxLayout *vertLayout = new QVBoxLayout( tab, 3, 3 );
@@ -349,42 +349,42 @@ QWidget *TabDialog::createBgTab ( QWidget *parent )
         hb-> setSpacing ( 3 );
 
     rb = new QRadioButton( tr( "Solid color" ), tab, "solid" );
     m_bgtype-> insert ( rb, TabConfig::SolidColor );
     hb-> addWidget ( rb );
         hb-> addSpacing ( 10 );
 
         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 );
         hb-> addStretch ( 10 );
 
     gridLayout-> addLayout ( hb, 1, 1 );
 
         hb = new QHBoxLayout ( );
         hb-> setSpacing ( 3 );
 
         rb = new QRadioButton( tr( "Image" ), tab, "image" );
     m_bgtype-> insert ( rb, TabConfig::Image );
     hb-> addWidget( rb );
     hb-> addSpacing ( 10 );
 
         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 );
         hb-> addStretch ( 10 );
 
     gridLayout-> addLayout ( hb, 2, 1 );
 
         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)));
 
         vertLayout-> addStretch ( 10 );
 
         return tab;
 }
 
 QWidget *TabDialog::createIconTab ( QWidget *parent )
 {
@@ -404,28 +404,28 @@ QWidget *TabDialog::createIconTab ( QWidget *parent )
     rb = new QRadioButton( tr( "Small" ), tab, "iconsmall" );
     m_iconsize-> insert ( rb, TabConfig::List );
     gridLayout-> addWidget( rb, 0, 1 );
 
     rb = new QRadioButton( tr( "Large" ), tab, "iconlarge" );
     m_iconsize-> insert ( rb, TabConfig::Icon );
     gridLayout-> addWidget( rb, 1, 1 );
 
-        connect ( m_iconsize, SIGNAL( clicked ( int )), this, SLOT( iconSizeClicked ( int )));
+        connect ( m_iconsize, SIGNAL( clicked(int)), this, SLOT( iconSizeClicked(int)));
 
         //vertLayout-> addSpacing ( 8 );
 
         //gridLayout = new QGridLayout ( vertLayout );
         gridLayout-> addRowSpacing ( 2, 8 );
 
         label = new QLabel ( tr( "Color:" ), tab );
         gridLayout-> addWidget ( label, 3, 0 );
 
         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 );
 
         vertLayout-> addStretch ( 10 );
 
         return tab;
 }
 
 
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
@@ -61,25 +61,25 @@ TabsSettings::TabsSettings ( QWidget *parent, const char *name )
         m_list = new QListBox ( this );
         lay-> addMultiCellWidget ( m_list, 1, 4, 0, 0 );
 
         QWhatsThis::add ( m_list, tr( "foobar" ));
 
         QPushButton *p1, *p2, *p3;
         p1 = new QPushButton ( tr( "New" ), this );
         lay-> addWidget ( p1, 1, 1 );
-        connect ( p1, SIGNAL( clicked ( )), this, SLOT( newClicked ( )));
+        connect ( p1, SIGNAL( clicked()), this, SLOT( newClicked()));
 
         p2 = new QPushButton ( tr( "Edit" ), this );
         lay-> addWidget ( p2, 2, 1 );
-        connect ( p2, SIGNAL( clicked ( )), this, SLOT( editClicked ( )));
+        connect ( p2, SIGNAL( clicked()), this, SLOT( editClicked()));
 
         p3 = new QPushButton ( tr( "Delete" ), this );
         lay-> addWidget ( p3, 3, 1 );
-        connect ( p3, SIGNAL( clicked ( )), this, SLOT( deleteClicked ( )));
+        connect ( p3, SIGNAL( clicked()), this, SLOT( deleteClicked()));
 
         lay-> setRowStretch ( 4, 10 );
 
                 m_bigbusy = new QCheckBox( tr( "Enable big busy indicator" ),  this );
                 lay-> addMultiCellWidget ( m_bigbusy, 5, 5, 0, 1 );
 
         m_busyani = new QCheckBox ( tr( "Enable animated busy indicator" ), this );
         lay-> addMultiCellWidget ( m_busyani, 6, 6, 0, 1 );
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
@@ -57,17 +57,17 @@ TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
         m_list = new QListView ( this );
         m_list-> addColumn ( "foobar" );
         m_list-> header ( )-> hide ( );
 
         lay-> addWidget ( m_list );
 
         QWhatsThis::add ( m_list, tr( "Check the applets that you want displayed in the Taskbar." ));
 
-        connect ( m_list, SIGNAL( clicked ( QListViewItem * )), this, SLOT( appletChanged ( )));
+        connect ( m_list, SIGNAL( clicked(QListViewItem*)), this, SLOT( appletChanged()));
 
         init ( );
 }
 
 void TaskbarSettings::init ( )
 {
         Config cfg ( "Taskbar" );
         cfg. setGroup ( "Applets" );
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
@@ -167,53 +167,53 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 
         // warnings
         config. setGroup ( "Warnings" );
         warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 );
         lowSpinBox->      setValue ( config. readNumEntry ( "powerverylow", 10 ) );
         criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) );
 
         m_resettimer = new QTimer ( this );
-        connect ( m_resettimer, SIGNAL( timeout ( )), this, SLOT( resetBacklight ( )));
+        connect ( m_resettimer, SIGNAL( timeout()), this, SLOT( resetBacklight()));
 
         if ( PowerStatusManager::readStatus ( ). acStatus ( ) != PowerStatus::Online ) {
                 tabs-> setCurrentPage ( 0 );
         }
         else {
                 tabs-> setCurrentPage ( 1 );
         }
 
-        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)));
         }
         connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) );
         connect( frequency_ac, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) );
         connect( closeHingeAction, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) );
         connect( closeHingeAction_ac, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) );
 }
 
 LightSettings::~LightSettings ( )
 {
 }
 
 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 );
         delete s;
 }
 
 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 );
         delete s;
 }
 
 void LightSettings::setBacklight ( int bright )
 {
         QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
         e << bright;
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
@@ -68,21 +68,21 @@ Sensor::Sensor ( QStringList &params, QWidget *parent, const char *name )
         m_calib-> setLineSteps ( steps );
         m_calib-> setInterval ( inter );
         m_calib-> setStartPoint ( QPoint ( smin * xscale / 256, lmax * yscale / 256 ));
         m_calib-> setEndPoint ( QPoint ( smax * xscale / 256, lmin * yscale / 256 ));
         
         interval-> setValue ( inter );
         linesteps-> setValue ( steps );
         
-        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&)));
 }                
 
 void Sensor::accept ( )
 {
         int xscale = ODevice::inst ( )-> lightSensorResolution ( );
         int yscale = ODevice::inst ( )-> displayBrightnessResolution ( );
 
         m_params. clear ( );
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
@@ -81,18 +81,18 @@ class QuickLauncher : public QObject
 {
     Q_OBJECT
 public:
     QuickLauncher() : QObject()
     {
         QCString ch("QPE/QuickLauncher-");
         ch += QString::number(getpid());
         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&)) );
     }
 
     static void exec( int /*argc*/, char **argv )
     {
         QString appName = argv[0];
         int sep = appName.findRev( '/' );
         if ( sep > 0 )
             appName = appName.mid( sep+1 );