diff options
Diffstat (limited to 'kontact/src/mainwindow.cpp')
| -rw-r--r-- | kontact/src/mainwindow.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
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(); |