From f4fae92b6768541e2952173c3d4b09040f95bf7e Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 16 Feb 2011 20:17:18 +0000
Subject: Moved kpilot from kdepim to applications, as the core Trinity
 libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kontact/src/mainwindow.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'kontact/src/mainwindow.cpp')

diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 247bb6654..ab6134669 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::fromLatin1( "Kontact/Plugin" ),
+      TQString::tqfromLatin1( "Kontact/Plugin" ),
       TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
   mPluginInfos = KPluginInfo::fromServices( offers, Prefs::self()->config(), "Plugins" );
 
@@ -187,7 +187,7 @@ void MainWindow::initObject()
   // done initializing
   slotShowStatusMsg( TQString::null );
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
+  connect( KPIM::BroadcasStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
            this, TQT_SLOT( slotShowStatusMsg( const TQString&  ) ) );
 
   // launch commandline specified module if any
@@ -226,7 +226,7 @@ void MainWindow::activatePluginModule()
   if ( !mActiveModule.isEmpty() ) {
     PluginList::ConstIterator end = mPlugins.end();
     for ( PluginList::ConstIterator it = mPlugins.begin(); it != end; ++it )
-      if ( ( *it )->identifier().contains( mActiveModule ) ) {
+      if ( ( *it )->identifier().tqcontains( mActiveModule ) ) {
         selectPlugin( *it );
         return;
       }
@@ -244,7 +244,7 @@ void MainWindow::initWidgets()
   mSplitter = new TQSplitter( mTopWidget );
   mBox = new TQHBox( mTopWidget );
   mSidePane = new IconSidePane( this, mSplitter );
-  mSidePane->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum,
+  mSidePane->tqsetSizePolicy( 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->setAlignment( AlignLeft | AlignVCenter );
+  mStatusMsgLabel->tqsetAlignment( AlignLeft | AlignVCenter );
 
   statusBar()->addWidget( mStatusMsgLabel, 10 , false );
   statusBar()->addWidget( mLittleProgress, 0 , true );
@@ -802,15 +802,15 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
   }
 
   // store old focus widget
-  TQWidget *focusWidget = kapp->focusWidget();
-  if ( mCurrentPlugin && focusWidget ) {
+  TQWidget *tqfocusWidget = kapp->tqfocusWidget();
+  if ( mCurrentPlugin && tqfocusWidget ) {
     // save the focus widget only when it belongs to the activated part
-    TQWidget *parent = focusWidget->parentWidget();
+    TQWidget *parent = tqfocusWidget->tqparentWidget();
     while ( parent ) {
       if ( parent == mCurrentPlugin->part()->widget() )
-        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( focusWidget ) );
+        mFocusWidgets.insert( mCurrentPlugin->identifier(), TQGuardedPtr<TQWidget>( tqfocusWidget ) );
 
-      parent = parent->parentWidget();
+      parent = parent->tqparentWidget();
     }
   }
 
@@ -828,10 +828,10 @@ void MainWindow::selectPlugin( Kontact::Plugin *plugin )
     mPartsStack->raiseWidget( view );
     view->show();
 
-    if ( mFocusWidgets.contains( plugin->identifier() ) ) {
-      focusWidget = mFocusWidgets[ plugin->identifier() ];
-      if ( focusWidget )
-        focusWidget->setFocus();
+    if ( mFocusWidgets.tqcontains( plugin->identifier() ) ) {
+      tqfocusWidget = mFocusWidgets[ plugin->identifier() ];
+      if ( tqfocusWidget )
+        tqfocusWidget->setFocus();
     } else
       view->setFocus();
 
-- 
cgit v1.2.1