Rename old tq methods that no longer need a unique name

7 files changed, 27 insertions, 27 deletions

diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 1bbd0ef6c..1d52da2f1 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -96,7 +96,7 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
     text.replace( "\n", "<br>" );
 
     KActiveLabel *label = new KActiveLabel( text, topFrame );
-    label->tqsetAlignment( AlignTop );
+    label->setAlignment( AlignTop );
     topLayout->addWidget( label );
 
 
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 4eacd6088..91abb28a0 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -173,13 +173,13 @@ void EntryItem::paint( TQPainter *p )
 
     TQBrush brush;
     if ( isCurrent() || isSelected() || mPaintActive )
-      brush = box->tqcolorGroup().brush( TQColorGroup::Highlight );
+      brush = box->colorGroup().brush( TQColorGroup::Highlight );
     else
-      brush = TQBrush(box->tqcolorGroup().highlight().light( 115 ));
+      brush = TQBrush(box->colorGroup().highlight().light( 115 ));
     p->fillRect( 1, 0, w - 2, h - 1, brush );
     TQPen pen = p->pen();
     TQPen oldPen = pen;
-    pen.setColor( box->tqcolorGroup().mid() );
+    pen.setColor( box->colorGroup().mid() );
     p->setPen( pen );
 
     p->drawPoint( 1, 0 );
@@ -196,9 +196,9 @@ void EntryItem::paint( TQPainter *p )
     p->drawPixmap( x, y, mPixmap );
   }
 
-  TQColor shadowColor = listBox()->tqcolorGroup().background().dark(115);
+  TQColor shadowColor = listBox()->colorGroup().background().dark(115);
   if ( isCurrent() || isSelected() ) {
-    p->setPen( box->tqcolorGroup().highlightedText() );
+    p->setPen( box->colorGroup().highlightedText() );
   }
 
   if ( !text().isEmpty() && navigator()->showText() ) {
@@ -225,13 +225,13 @@ void EntryItem::paint( TQPainter *p )
     if ( plugin()->disabled() ) {
       p->setPen( box->tqpalette().disabled().text( ) );
     } else if ( isCurrent() || isSelected() || mHasHover ) {
-      p->setPen( box->tqcolorGroup().highlight().dark(115) );
+      p->setPen( box->colorGroup().highlight().dark(115) );
       p->drawText( x + ( TQApplication::reverseLayout() ? -1 : 1),
           y + 1, text() );
-      p->setPen( box->tqcolorGroup().highlightedText() );
+      p->setPen( box->colorGroup().highlightedText() );
     }
     else
-      p->setPen( box->tqcolorGroup().text() );
+      p->setPen( box->colorGroup().text() );
 
     p->drawText( x, y, text() );
   }
@@ -284,7 +284,7 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
 
 }
 
-TQSize Navigator::tqsizeHint() const
+TQSize Navigator::sizeHint() const
 {
   return TQSize( 100, 100 );
 }
diff --git a/kontact/src/iconsidepane.h b/kontact/src/iconsidepane.h
index d215558df..135332284 100644
--- a/kontact/src/iconsidepane.h
+++ b/kontact/src/iconsidepane.h
@@ -101,12 +101,12 @@ class EntryItemToolTip : public TQToolTip
       if ( !mListBox ) return;
       TQListBoxItem* item = mListBox->itemAt( p );
       if ( !item ) return;
-      const TQRect tqitemRect = mListBox->tqitemRect( item );
-      if ( !tqitemRect.isValid() ) return;
+      const TQRect itemRect = mListBox->itemRect( item );
+      if ( !itemRect.isValid() ) return;
 
       const EntryItem *entryItem = static_cast<EntryItem*>( item );
       TQString tipStr = entryItem->text();
-      tip( tqitemRect, tipStr );
+      tip( itemRect, tipStr );
     }
   private:
     TQListBox* mListBox;
@@ -126,7 +126,7 @@ class Navigator : public KListBox
 
     void updatePlugins( TQValueList<Kontact::Plugin*> plugins );
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
     void highlightItem( EntryItem* item );
 
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 7bfed9cd4..5de81055e 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -114,7 +114,7 @@ PluginSelection::~PluginSelection()
 void PluginSelection::readConfig()
 {
   const KTrader::OfferList offers = KTrader::self()->query(
-      TQString::tqfromLatin1( "Kontact/Plugin" ),
+      TQString::fromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
 
   int activeComponent = 0;
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index d2a57bcb7..5cf0bfd50 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -76,7 +76,7 @@ static void listPlugins()
 {
   KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
   KTrader::OfferList offers = KTrader::self()->query(
-    TQString::tqfromLatin1( "Kontact/Plugin" ),
+    TQString::fromLatin1( "Kontact/Plugin" ),
     TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
   for ( KService::List::Iterator it = offers.begin(); it != offers.end(); ++it ) {
     KService::Ptr service = (*it);
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index fe24bd8dd..06664d41e 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -124,7 +124,7 @@ void MainWindow::initGUI()
            TQT_SLOT( showAboutDialog() ) );
 
   KTrader::OfferList offers = KTrader::self()->query(
-      TQString::tqfromLatin1( "Kontact/Plugin" ),
+      TQString::fromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
   mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
 
@@ -244,7 +244,7 @@ void MainWindow::initWidgets()
   mSplitter = new TQSplitter( mTopWidget );
   mBox = new TQHBox( mTopWidget );
   mSidePane = new IconSidePane( this, mSplitter );
-  mSidePane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
+  mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
                                          TQSizePolicy::Preferred ) );
   // donÄt occupy screen estate on load
   TQValueList<int> sizes;
@@ -278,7 +278,7 @@ void MainWindow::initWidgets()
   mLittleProgress = new KPIM::StatusbarProgressWidget( progressDialog, statusBar() );
 
   mStatusMsgLabel = new KRSqueezedTextLabel( i18n( " Initializing..." ), statusBar() );
-  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->setAlignment( AlignLeft | AlignVCenter );
 
   statusBar()->addWidget( mStatusMsgLabel, 10 , false );
   statusBar()->addWidget( mLittleProgress, 0 , true );
@@ -802,13 +802,13 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   }
 
   // store old focus widget
-  TQWidget *tqfocusWidget = kapp->tqfocusWidget();
-  if ( mCurrentPlugin && tqfocusWidget ) {
+  TQWidget *focusWidget = kapp->focusWidget();
+  if ( mCurrentPlugin && focusWidget ) {
     // save the focus widget only when it belongs to the activated part
-    TQWidget *parent = tqfocusWidget->parentWidget();
+    TQWidget *parent = focusWidget->parentWidget();
     while ( parent ) {
       if ( parent == mCurrentPlugin->part()->widget() )
-        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
+        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( focusWidget ) );
 
       parent = parent->parentWidget();
     }
@@ -829,9 +829,9 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     view->show();
 
     if ( mFocusWidgets.contains( plugin->identifier() ) ) {
-      tqfocusWidget = mFocusWidgets[ plugin->identifier() ];
-      if ( tqfocusWidget )
-        tqfocusWidget->setFocus();
+      focusWidget = mFocusWidgets[ plugin->identifier() ];
+      if ( focusWidget )
+        focusWidget->setFocus();
     } else
       view->setFocus();
 
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 91fc370db..67f1bd198 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -178,7 +178,7 @@ void Kontact::ProfileManager::writeProfileConfig( const Kontact::Profile& profil
 void Kontact::ProfileManager::readConfig()
 {
     
-    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::tqfromLatin1( "kontact/profiles/*/profile.cfg" ) );
+    const TQStringList profilePaths = KGlobal::dirs()->findAllResources( "data", TQString::fromLatin1( "kontact/profiles/*/profile.cfg" ) );
 
     typedef TQMap<TQString, Kontact::Profile> ProfileMap;
     ProfileMap profiles;