applied changes from optimize_connect script

4 files changed, 32 insertions, 32 deletions

diff --git a/libopie2/qt3/opieui/ocombobox.cpp b/libopie2/qt3/opieui/ocombobox.cpp
index 8dbda8f..bd330e0 100644
--- a/libopie2/qt3/opieui/ocombobox.cpp
+++ b/libopie2/qt3/opieui/ocombobox.cpp
@@ -307,62 +307,62 @@ OCompletionBox * OComboBox::completionBox( bool create )
     if ( d->olineEdit )
         return d->olineEdit->completionBox( create );
     return 0;
 }
 
 // QWidget::create() turns off mouse-Tracking which would break auto-hiding
 void OComboBox::create( WId id, bool initializeWindow, bool destroyOldWindow )
 {
     QComboBox::create( id, initializeWindow, destroyOldWindow );
     //OCursor::setAutoHideCursor( lineEdit(), true, true );
 }
 
 void OComboBox::setLineEdit( OLineEdit *edit )
 {
     #if QT_VERSION > 290
     QComboBox::setLineEdit( edit );
     if ( !edit->inherits( "OLineEdit" ) )
         d->olineEdit = 0;
     else
         d->olineEdit = static_cast<OLineEdit*>( edit );
     setDelegate( d->olineEdit );
 
     // forward some signals. We only emit returnPressed() ourselves.
     if ( d->olineEdit ) {
-        connect( d->olineEdit, SIGNAL( completion( const QString& )),
-                 SIGNAL( completion( const QString& )) );
-        connect( d->olineEdit, SIGNAL( substringCompletion( const QString& )),
-                 SIGNAL( substringCompletion( const QString& )) );
+        connect( d->olineEdit, SIGNAL( completion(const QString&)),
+                 SIGNAL( completion(const QString&)) );
+        connect( d->olineEdit, SIGNAL( substringCompletion(const QString&)),
+                 SIGNAL( substringCompletion(const QString&)) );
         connect( d->olineEdit,
-                 SIGNAL( textRotation( OCompletionBase::KeyBindingType )),
-                 SIGNAL( textRotation( OCompletionBase::KeyBindingType )) );
+                 SIGNAL( textRotation(OCompletionBase::KeyBindingType)),
+                 SIGNAL( textRotation(OCompletionBase::KeyBindingType)) );
         connect( d->olineEdit,
-                 SIGNAL( completionModeChanged( OGlobalSettings::Completion )),
-                 SIGNAL( completionModeChanged( OGlobalSettings::Completion)));
+                 SIGNAL( completionModeChanged(OGlobalSettings::Completion)),
+                 SIGNAL( completionModeChanged(OGlobalSettings::Completion)));
 
         connect( d->olineEdit,
-                 SIGNAL( aboutToShowContextMenu( QPopupMenu * )),
-                 SIGNAL( aboutToShowContextMenu( QPopupMenu * )) );
+                 SIGNAL( aboutToShowContextMenu(QPopupMenu*)),
+                 SIGNAL( aboutToShowContextMenu(QPopupMenu*)) );
     }
     #else
     #warning OComboBox is not fully functional with Qt2
     #endif
 }
 
 // Temporary functions until QT3 appears. - Seth Chaiklin 20 may 2001
 void OComboBox::deleteWordForward()
 {
     lineEdit()->cursorWordForward(TRUE);
     #if QT_VERSION > 290
     if ( lineEdit()->hasSelectedText() )
     #else
     if ( lineEdit()->hasMarkedText() )
     #endif
     {
         lineEdit()->del();
     }
 }
 
 void OComboBox::deleteWordBack()
 {
     lineEdit()->cursorWordBackward(TRUE);
     #if QT_VERSION > 290
diff --git a/libopie2/qt3/opieui/ocompletionbox.cpp b/libopie2/qt3/opieui/ocompletionbox.cpp
index b594b8e..b36123e 100644
--- a/libopie2/qt3/opieui/ocompletionbox.cpp
+++ b/libopie2/qt3/opieui/ocompletionbox.cpp
@@ -46,56 +46,56 @@ public:
     bool tabHandling;
     bool down_workaround;
 };
 
 OCompletionBox::OCompletionBox( QWidget *parent, const char *name )
     :OListBox( parent, name, WType_Popup )
 {
     d = new OCompletionBoxPrivate;
     d->m_parent        = parent;
     d->tabHandling     = true;
     d->down_workaround = false;
 
     setColumnMode( 1 );
     setLineWidth( 1 );
     setFrameStyle( QFrame::Box | QFrame::Plain );
 
     if ( parent )
         setFocusProxy( parent );
     else
         setFocusPolicy( NoFocus );
 
     setVScrollBarMode( Auto );
     setHScrollBarMode( AlwaysOff );
 
-    connect( this, SIGNAL( doubleClicked( QListBoxItem * )),
-             SLOT( slotActivated( QListBoxItem * )) );
+    connect( this, SIGNAL( doubleClicked(QListBoxItem*)),
+             SLOT( slotActivated(QListBoxItem*)) );
 
     // grmbl, just QListBox workarounds :[ Thanks Volker.
-    connect( this, SIGNAL( currentChanged( QListBoxItem * )),
+    connect( this, SIGNAL( currentChanged(QListBoxItem*)),
              SLOT( slotCurrentChanged() ));
-    connect( this, SIGNAL( clicked( QListBoxItem * )),
-             SLOT( slotItemClicked( QListBoxItem * )) );
+    connect( this, SIGNAL( clicked(QListBoxItem*)),
+             SLOT( slotItemClicked(QListBoxItem*)) );
 }
 
 OCompletionBox::~OCompletionBox()
 {
     d->m_parent = 0L;
     delete d;
 }
 
 QStringList OCompletionBox::items() const
 {
     QStringList list;
     for ( uint i = 0; i < count(); i++ ) {
         list.append( text( i ) );
     }
     return list;
 }
 
 void OCompletionBox::slotActivated( QListBoxItem *item )
 {
     if ( !item )
         return;
 
     hide();
     emit activated( item->text() );
diff --git a/libopie2/qt3/opieui/ojanuswidget.cpp b/libopie2/qt3/opieui/ojanuswidget.cpp
index 0a037ff..063e393 100644
--- a/libopie2/qt3/opieui/ojanuswidget.cpp
+++ b/libopie2/qt3/opieui/ojanuswidget.cpp
@@ -88,49 +88,49 @@ OJanusWidget::OJanusWidget( QWidget *parent, const char *name, int face )
     mValid(false), mPageList(0),
     mTitleList(0), mFace(face), mTitleLabel(0), mActivePageWidget(0),
     mShowIconsInTreeList(false), d(0)
 {
   QVBoxLayout *topLayout = new QVBoxLayout( this );
 
   if( mFace == TreeList || mFace == IconList )
   {
     mPageList = new QPtrList<QWidget>;
     mTitleList = new QStringList();
 
     QFrame *page;
     if( mFace == TreeList )
     {
       QSplitter *splitter = new QSplitter( this );
       topLayout->addWidget( splitter, 10 );
       mTreeListResizeMode = QSplitter::KeepSize;
 
       mTreeList = new QListView( splitter );
       mTreeList->addColumn( QString::fromLatin1("") );
       mTreeList->header()->hide();
       mTreeList->setRootIsDecorated(true);
       mTreeList->setSorting( -1 );
       connect( mTreeList, SIGNAL(selectionChanged()), SLOT(slotShowPage()) );
-      connect( mTreeList, SIGNAL(clicked(QListViewItem *)), SLOT(slotItemClicked(QListViewItem *)));
+      connect( mTreeList, SIGNAL(clicked(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*)));
 
       //
       // Page area. Title at top with a separator below and a pagestack using
       // all available space at bottom.
       //
       QFrame *p = new QFrame( splitter );
 
       QHBoxLayout *hbox = new QHBoxLayout( p, 0, 0 );
       hbox->addSpacing( ODialog::spacingHint() );
 
       page = new QFrame( p );
       hbox->addWidget( page, 10 );
     }
     else
     {
       QHBoxLayout *hbox = new QHBoxLayout( topLayout );
       mIconList = new IconListBox( this );
 
       QFont listFont( mIconList->font() );
       listFont.setBold( true );
       mIconList->setFont( listFont );
 
       mIconList->verticalScrollBar()->installEventFilter( this );
       hbox->addWidget( mIconList );
@@ -138,50 +138,50 @@ OJanusWidget::OJanusWidget( QWidget *parent, const char *name, int face )
       hbox->addSpacing( ODialog::spacingHint() );
       page = new QFrame( this );
       hbox->addWidget( page, 10 );
     }
 
     //
     // Rest of page area. Title at top with a separator below and a
     // pagestack using all available space at bottom.
     //
 
     QVBoxLayout *vbox = new QVBoxLayout( page, 0, ODialog::spacingHint() );
 
     mTitleLabel = new QLabel( QString::fromLatin1("Empty page"), page, "OJanusWidgetTitleLabel" );
     vbox->addWidget( mTitleLabel );
 
     QFont titleFont( mTitleLabel->font() );
     titleFont.setBold( true );
     mTitleLabel->setFont( titleFont );
 
     mTitleSep = new OSeparator( page );
     mTitleSep->setFrameStyle( QFrame::HLine|QFrame::Plain );
     vbox->addWidget( mTitleSep );
 
     mPageStack = new QWidgetStack( page );
-    connect(mPageStack, SIGNAL(aboutToShow(QWidget *)),
-            this, SIGNAL(aboutToShowPage(QWidget *)));
+    connect(mPageStack, SIGNAL(aboutToShow(QWidget*)),
+            this, SIGNAL(aboutToShowPage(QWidget*)));
     vbox->addWidget( mPageStack, 10 );
   }
   else if( mFace == Tabbed )
   {
     mPageList = new QPtrList<QWidget>;
 
     mTabControl = new QTabWidget( this );
     mTabControl->setMargin (ODialog::marginHint());
     topLayout->addWidget( mTabControl, 10 );
   }
   else if( mFace == Swallow )
   {
     mSwallowPage = new QWidget( this );
     topLayout->addWidget( mSwallowPage, 10 );
   }
   else
   {
     mFace = Plain;
     mPlainPage = new QFrame( this );
     topLayout->addWidget( mPlainPage, 10 );
   }
 
   /* FIXME: Revise for Opie
   if ( kapp )
@@ -842,51 +842,51 @@ void OJanusWidget::setIconListAllVisible( bool state )
 {
   if( mFace == IconList )
   {
     mIconList->setShowAll( state );
   }
 }
 
 void OJanusWidget::setShowIconsInTreeList( bool state )
 {
   mShowIconsInTreeList = state;
 }
 
 void OJanusWidget::setRootIsDecorated( bool state )
 {
   if( mFace == TreeList ) {
     mTreeList->setRootIsDecorated(state);
   }
 }
 
 void OJanusWidget::unfoldTreeList( bool persist )
 {
   if( mFace == TreeList )
   {
     if( persist )
-      connect( mTreeList, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( slotReopen( QListViewItem * ) ) );
+      connect( mTreeList, SIGNAL( collapsed(QListViewItem*) ), this, SLOT( slotReopen(QListViewItem*) ) );
     else
-      disconnect( mTreeList, SIGNAL( collapsed( QListViewItem * ) ), this, SLOT( slotReopen( QListViewItem * ) ) );
+      disconnect( mTreeList, SIGNAL( collapsed(QListViewItem*) ), this, SLOT( slotReopen(QListViewItem*) ) );
 
     for( QListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() )
       item->setOpen( true );
   }
 }
 
 void OJanusWidget::showEvent( QShowEvent * )
 {
   if( mFace == TreeList )
   {
     QSplitter *splitter = (QSplitter*)(mTreeList->parentWidget());
     splitter->setResizeMode( mTreeList, mTreeListResizeMode );
   }
 }
 
 
 //
 // 2000-13-02 Espen Sand
 // It should be obvious that this eventfilter must only be
 // be installed on the vertical scrollbar of the mIconList.
 //
 bool OJanusWidget::eventFilter( QObject *o, QEvent *e )
 {
   if( e->type() == QEvent::Show )
diff --git a/libopie2/qt3/opieui/olineedit.cpp b/libopie2/qt3/opieui/olineedit.cpp
index 9cb0cff..6f66fc7 100644
--- a/libopie2/qt3/opieui/olineedit.cpp
+++ b/libopie2/qt3/opieui/olineedit.cpp
@@ -426,50 +426,50 @@ void OLineEdit::mousePressEvent( QMouseEvent* e )
 }
 
 void OLineEdit::tripleClickTimeout()
 {
     possibleTripleClick=false;
 }
 
 QPopupMenu *OLineEdit::createPopupMenu()
 {
     // Return if popup menu is not enabled !!
     if ( !m_bEnableMenu )
         return 0;
 
     #if QT_VERSION > 290
     QPopupMenu *popup = QLineEdit::createPopupMenu();
     #else
     QPopupMenu *popup = new QPopupMenu();
     #warning OLineEdit is not fully functional on Qt2
     #endif
 
     // completion object is present.
     if ( compObj() )
     {
         QPopupMenu *subMenu = new QPopupMenu( popup );
-        connect( subMenu, SIGNAL( activated( int ) ),
-                 this, SLOT( completionMenuActivated( int ) ) );
+        connect( subMenu, SIGNAL( activated(int) ),
+                 this, SLOT( completionMenuActivated(int) ) );
 
         popup->insertSeparator();
         //popup->insertItem( SmallIconSet("completion"), i18n("Text Completion"),
         //                   subMenu );
 
         popup->insertItem( tr("Text Completion"), subMenu );
 
         subMenu->insertItem( tr("None"), NoCompletion );
         subMenu->insertItem( tr("Manual"), ShellCompletion );
         subMenu->insertItem( tr("Automatic"), AutoCompletion );
         subMenu->insertItem( tr("Dropdown List"), PopupCompletion );
         subMenu->insertItem( tr("Short Automatic"), SemiAutoCompletion );
 
         //subMenu->setAccel( KStdAccel::completion(), ShellCompletion );
         subMenu->setAccel( Key_Tab, ShellCompletion );
 
         OGlobalSettings::Completion mode = completionMode();
         subMenu->setItemChecked( NoCompletion,
                                  mode == OGlobalSettings::CompletionNone );
         subMenu->setItemChecked( ShellCompletion,
                                  mode == OGlobalSettings::CompletionShell );
         subMenu->setItemChecked( PopupCompletion,
                                  mode == OGlobalSettings::CompletionPopup );
         subMenu->setItemChecked( AutoCompletion,
@@ -595,59 +595,59 @@ bool OLineEdit::isURLDropsEnabled() const
 
 void OLineEdit::setTrapReturnKey( bool grab )
 {
     d->grabReturnKeyEvents = grab;
 }
 
 bool OLineEdit::trapReturnKey() const
 {
     return d->grabReturnKeyEvents;
 }
 
 /*void OLineEdit::setURL( const KURL& url )
 {
     QLineEdit::setText( url.prettyURL() );
 }*/
 
 void OLineEdit::makeCompletionBox()
 {
     if ( d->completionBox )
         return;
 
     d->completionBox = new OCompletionBox( this, "completion box" );
     if ( handleSignals() )
     {
-        connect( d->completionBox, SIGNAL(highlighted( const QString& )),
-                 SLOT(setText( const QString& )) );
-        connect( d->completionBox, SIGNAL(userCancelled( const QString& )),
-                 SLOT(setText( const QString& )) );
+        connect( d->completionBox, SIGNAL(highlighted(const QString&)),
+                 SLOT(setText(const QString&)) );
+        connect( d->completionBox, SIGNAL(userCancelled(const QString&)),
+                 SLOT(setText(const QString&)) );
 
         // Nice lil' hacklet ;) KComboBox doesn't know when the completionbox
         // is created (childEvent() is even more hacky, IMHO), so we simply
         // forward the completionbox' activated signal from here.
         if ( parentWidget() && parentWidget()->inherits("KComboBox") )
-            connect( d->completionBox, SIGNAL( activated( const QString& )),
-                     parentWidget(), SIGNAL( activated( const QString & )));
+            connect( d->completionBox, SIGNAL( activated(const QString&)),
+                     parentWidget(), SIGNAL( activated(const QString&)));
     }
 }
 
 /*bool OLineEdit::overrideAccel (const QKeyEvent* e)
 {
   KShortcut scKey;
 
   KKey key( e );
   KeyBindingMap keys = getKeyBindings();
 
   if (keys[TextCompletion].isNull())
     scKey = KStdAccel::shortcut(KStdAccel::TextCompletion);
   else
     scKey = keys[TextCompletion];
 
   if (scKey.contains( key ))
     return true;
 
   if (keys[NextCompletionMatch].isNull())
     scKey = KStdAccel::shortcut(KStdAccel::NextCompletion);
   else
     scKey = keys[NextCompletionMatch];
 
   if (scKey.contains( key ))
@@ -685,45 +685,45 @@ void OLineEdit::setCompletedItems( const QStringList& items )
         if ( !txt.isEmpty() )
             d->completionBox->setCancelledText( txt );
         d->completionBox->setItems( items );
         d->completionBox->popup();
     }
     else
     {
         if ( d->completionBox && d->completionBox->isVisible() )
             d->completionBox->hide();
     }
 }
 
 OCompletionBox * OLineEdit::completionBox( bool create )
 {
     if ( create )
         makeCompletionBox();
 
     return d->completionBox;
 }
 
 void OLineEdit::setCompletionObject( OCompletion* comp, bool hsig )
 {
     OCompletion *oldComp = compObj();
     if ( oldComp && handleSignals() )
-        disconnect( oldComp, SIGNAL( matches( const QStringList& )),
-                    this, SLOT( setCompletedItems( const QStringList& )));
+        disconnect( oldComp, SIGNAL( matches(const QStringList&)),
+                    this, SLOT( setCompletedItems(const QStringList&)));
 
     if ( comp && hsig )
-      connect( comp, SIGNAL( matches( const QStringList& )),
-               this, SLOT( setCompletedItems( const QStringList& )));
+      connect( comp, SIGNAL( matches(const QStringList&)),
+               this, SLOT( setCompletedItems(const QStringList&)));
 
     OCompletionBase::setCompletionObject( comp, hsig );
 }
 
 // QWidget::create() turns off mouse-Tracking which would break auto-hiding
 void OLineEdit::create( WId id, bool initializeWindow, bool destroyOldWindow )
 {
     QLineEdit::create( id, initializeWindow, destroyOldWindow );
     //OCursor::setAutoHideCursor( this, true, true );
 }
 
 void OLineEdit::clear()
 {
     setText( QString::null );
 }