diff options
Diffstat (limited to 'ksysguard/gui/ksysguard.cpp')
-rw-r--r-- | ksysguard/gui/ksysguard.cpp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp index 937c5fdd1..ee7aeb6b5 100644 --- a/ksysguard/gui/ksysguard.cpp +++ b/ksysguard/gui/ksysguard.cpp @@ -47,7 +47,7 @@ #include <ksgrd/SensorAgent.h> #include <ksgrd/SensorManager.h> #include <ksgrd/StyleEngine.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> #include <twin.h> @@ -76,23 +76,23 @@ TopLevel::TopLevel( const char *name ) mTimerId = -1; mSplitter = new TQSplitter( this ); - mSplitter->setOrientation( Qt::Horizontal ); + mSplitter->setOrientation( TQt::Horizontal ); mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); setCentralWidget( mSplitter ); mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr ); mServiceBrowser = new DNSSD::ServiceBrowser("_ksysguard._tcp", 0, true); - connect(mServiceBrowser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, - TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); + connect(mServiceBrowser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, + TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); mWorkSpace = new Workspace( mSplitter ); - connect( mWorkSpace, TQT_SIGNAL( announceRecentURL( const KURL& ) ), - TQT_SLOT( registerRecentURL( const KURL& ) ) ); - connect( mWorkSpace, TQT_SIGNAL( setCaption( const TQString&, bool ) ), - TQT_SLOT( setCaption( const TQString&, bool ) ) ); - connect( KSGRD::Style, TQT_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, - TQT_SLOT( applyStyle() ) ); + connect( mWorkSpace, TQ_SIGNAL( announceRecentURL( const KURL& ) ), + TQ_SLOT( registerRecentURL( const KURL& ) ) ); + connect( mWorkSpace, TQ_SIGNAL( setCaption( const TQString&, bool ) ), + TQ_SLOT( setCaption( const TQString&, bool ) ) ); + connect( KSGRD::Style, TQ_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, + TQ_SLOT( applyStyle() ) ); /* Create the status bar. It displays some information about the * number of processes and the memory consumption of the local @@ -105,40 +105,40 @@ TopLevel::TopLevel( const char *name ) statusBar()->hide(); // create actions for menue entries - new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); + new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace, + TQ_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); - new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); + new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace, + TQ_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0, - TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); + mWorkSpace, TQ_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); - new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); + new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace, + TQ_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); - new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); + new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace, + TQ_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); - new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this), - TQT_SLOT( connectHost() ), actionCollection(), "connect_host" ); - new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this), - TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); + new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this, + TQ_SLOT( connectHost() ), actionCollection(), "connect_host" ); + new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this, + TQ_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); -// KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() ); -// KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() ); -// KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() ); - new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace), - TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); +// KStdAction::cut( mWorkSpace, TQ_SLOT( cut() ), actionCollection() ); +// KStdAction::copy( mWorkSpace, TQ_SLOT( copy() ), actionCollection() ); +// KStdAction::paste( mWorkSpace, TQ_SLOT( paste() ), actionCollection() ); + new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace, + TQ_SLOT( configure() ), actionCollection(), "configure_sheet" ); new TDEAction( i18n( "Load Standard Sheets" ), "document-revert", - 0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ), + 0, this, TQ_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); - new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this), - TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); + new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this, + TQ_SLOT( editStyle() ), actionCollection(), "configure_style" ); // TODO remove resize and fix so sizeHints() determines default size. if (!initialGeometrySet()) @@ -186,7 +186,7 @@ void TopLevel::showProcesses() void TopLevel::showOnCurrentDesktop() { KWin::setOnDesktop( winId(), KWin::currentDesktop() ); - kapp->updateUserTimestamp(); + tdeApp->updateUserTimestamp(); KWin::forceActiveWindow( winId() ); } @@ -216,7 +216,7 @@ TQString TopLevel::readIntegerSensor( const TQString &sensorLocator ) TQString sensor = sensorLocator.right( sensorLocator.length() - sensorLocator.find( ':' ) - 1 ); - DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction(); + DCOPClientTransaction *dcopTransaction = tdeApp->dcopClient()->beginTransaction(); mDCopFIFO.prepend( dcopTransaction ); KSGRD::SensorMgr->engage( host, "", "ksysguardd" ); @@ -233,7 +233,7 @@ TQStringList TopLevel::readListSensor( const TQString& sensorLocator ) TQString sensor = sensorLocator.right( sensorLocator.length() - sensorLocator.find( ':' ) - 1 ); - DCOPClientTransaction *dcopTransaction = kapp->dcopClient()->beginTransaction(); + DCOPClientTransaction *dcopTransaction = tdeApp->dcopClient()->beginTransaction(); mDCopFIFO.prepend( dcopTransaction ); KSGRD::SensorMgr->engage( host, "", "ksysguardd" ); @@ -293,7 +293,7 @@ void TopLevel::initStatusBar() TDEToggleAction *sb = dynamic_cast<TDEToggleAction*>(action("options_show_statusbar")); if (sb) - connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar())); + connect(sb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateStatusBar())); } void TopLevel::updateStatusBar() @@ -317,10 +317,10 @@ void TopLevel::disconnectHost() void TopLevel::editToolbars() { - saveMainWindowSettings( kapp->config() ); + saveMainWindowSettings( tdeApp->config() ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, - TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this, + TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } @@ -328,7 +328,7 @@ void TopLevel::editToolbars() void TopLevel::slotNewToolbarConfig() { createGUI(); - applyMainWindowSettings( kapp->config() ); + applyMainWindowSettings( tdeApp->config() ); } void TopLevel::editStyle() @@ -371,8 +371,8 @@ bool TopLevel::queryClose() if ( !mWorkSpace->saveOnQuit() ) return false; - saveProperties( kapp->config() ); - kapp->config()->sync(); + saveProperties( tdeApp->config() ); + tdeApp->config()->sync(); } return true; @@ -471,7 +471,7 @@ void TopLevel::answerReceived( int id, const TQString &answer ) reply << answer; DCOPClientTransaction *dcopTransaction = mDCopFIFO.last(); - kapp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData ); + tdeApp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData ); mDCopFIFO.removeLast(); break; } @@ -490,7 +490,7 @@ void TopLevel::answerReceived( int id, const TQString &answer ) reply << resultList; DCOPClientTransaction *dcopTransaction = mDCopFIFO.last(); - kapp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData ); + tdeApp->dcopClient()->endTransaction( dcopTransaction, replyType, replyData ); mDCopFIFO.removeLast(); break; } |