From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:17:06 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kdesktop/bgmanager.cc | 16 ++++++++-------- kdesktop/desktop.cc | 28 ++++++++++++++-------------- kdesktop/desktop.h | 2 +- kdesktop/kdiconview.cc | 2 +- kdesktop/krootwm.cc | 8 ++++---- kdesktop/kwebdesktop/kwebdesktop.cpp | 2 +- kdesktop/kxdglauncher.cpp | 2 +- kdesktop/lock/lockprocess.cc | 2 +- kdesktop/lock/main.cc | 4 ++-- kdesktop/lock/main.h | 4 ++-- kdesktop/minicli.cpp | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) (limited to 'kdesktop') diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index 278f267d5..aa0aa598d 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -72,7 +72,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule m_pDesktop = desktop; if (desktop == 0L) - desktop = TQT_TQWIDGET(KApplication::desktop()->screen()); + desktop = TQT_TQWIDGET(TDEApplication::desktop()->screen()); m_Renderer.resize( 1 ); m_Cache.resize( 1 ); @@ -529,14 +529,14 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) root_cleared = true; TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot())); // but make the pixmap visible until m_pDesktop is visible - TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } } else { - TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap(*ep); - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap(*ep); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } // and export it via Esetroot-style for gnome/GTK apps to share in the pretties @@ -556,8 +556,8 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) void KBackgroundManager::clearRoot() { - TQT_TQWIDGET(KApplication::desktop()->screen())->setErasePixmap( TQPixmap()); - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->setErasePixmap( TQPixmap()); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } /* @@ -925,7 +925,7 @@ void KBackgroundManager::repaintBackground() if (m_pDesktop) m_pDesktop->repaint(); else - TQT_TQWIDGET(KApplication::desktop()->screen())->erase(); + TQT_TQWIDGET(TDEApplication::desktop()->screen())->erase(); } void KBackgroundManager::desktopResized() diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 0a105a373..42f7f8a7d 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -794,13 +794,13 @@ void KDesktop::configure() void KDesktop::slotSettingsChanged(int category) { //kdDebug(1204) << "KDesktop::slotSettingsChanged" << endl; - if (category == KApplication::SETTINGS_PATHS) + if (category == TDEApplication::SETTINGS_PATHS) { kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_PATHS" << endl; if (m_pIconView) m_pIconView->recheckDesktopURL(); } - else if (category == KApplication::SETTINGS_SHORTCUTS) + else if (category == TDEApplication::SETTINGS_SHORTCUTS) { kdDebug(1204) << "KDesktop::slotSettingsChanged SETTINGS_SHORTCUTS" << endl; keys->readSettings(); @@ -1021,12 +1021,12 @@ void KDesktop::slotNewWallpaper(const KURL &url) // for dcop interface backward compatibility void KDesktop::logout() { - logout( KApplication::ShutdownConfirmDefault, - KApplication::ShutdownTypeNone ); + logout( TDEApplication::ShutdownConfirmDefault, + TDEApplication::ShutdownTypeNone ); } -void KDesktop::logout( KApplication::ShutdownConfirm confirm, - KApplication::ShutdownType sdtype ) +void KDesktop::logout( TDEApplication::ShutdownConfirm confirm, + TDEApplication::ShutdownType sdtype ) { if( !kapp->requestShutDown( confirm, sdtype ) ) // this i18n string is also in kicker/applets/run/runapplet @@ -1038,26 +1038,26 @@ void KDesktop::logout( KApplication::ShutdownConfirm confirm, void KDesktop::slotLogout() { - logout( KApplication::ShutdownConfirmDefault, - KApplication::ShutdownTypeDefault ); + logout( TDEApplication::ShutdownConfirmDefault, + TDEApplication::ShutdownTypeDefault ); } void KDesktop::slotLogoutNoCnf() { - logout( KApplication::ShutdownConfirmNo, - KApplication::ShutdownTypeNone ); + logout( TDEApplication::ShutdownConfirmNo, + TDEApplication::ShutdownTypeNone ); } void KDesktop::slotHaltNoCnf() { - logout( KApplication::ShutdownConfirmNo, - KApplication::ShutdownTypeHalt ); + logout( TDEApplication::ShutdownConfirmNo, + TDEApplication::ShutdownTypeHalt ); } void KDesktop::slotRebootNoCnf() { - logout( KApplication::ShutdownConfirmNo, - KApplication::ShutdownTypeReboot ); + logout( TDEApplication::ShutdownConfirmNo, + TDEApplication::ShutdownTypeReboot ); } void KDesktop::setVRoot( bool enable ) diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index cad822fc2..a681dc9a5 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -94,7 +94,7 @@ public: virtual void desktopIconsAreaChanged(const TQRect &area, int screen); - void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype ); + void logout( TDEApplication::ShutdownConfirm confirm, TDEApplication::ShutdownType sdtype ); KWinModule* twinModule() const { return m_pKwinmodule; } diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 1590443d8..387195a4f 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -780,7 +780,7 @@ void KDIconView::saveMediaListView() // Reload kdesktop configuration to apply changes TQByteArray data; - int konq_screen_number = KApplication::desktop()->primaryScreen(); + int konq_screen_number = TDEApplication::desktop()->primaryScreen(); TQCString appname; if (konq_screen_number == 0) appname = "kdesktop"; diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 90b4ebd66..283d46cb3 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -523,7 +523,7 @@ void KRootWm::slotToggleAutoAlign( bool b ) KDesktopSettings::writeConfig(); // Also save it globally... - int desktop = KApplication::desktop()->primaryScreen(); + int desktop = TDEApplication::desktop()->primaryScreen(); TQCString cfilename; if (desktop == 0) cfilename = "kdesktoprc"; @@ -627,7 +627,7 @@ void KRootWm::mousePressed( const TQPoint& _global, int _button ) void KRootWm::slotWindowList() { // kdDebug() << "KRootWm::slotWindowList" << endl; // Popup at the center of the screen, this is from keyboard shortcut. - TQDesktopWidget* desktop = KApplication::desktop(); + TQDesktopWidget* desktop = TDEApplication::desktop(); TQRect r; if (desktop->numScreens() < 2) r = desktop->geometry(); @@ -647,7 +647,7 @@ void KRootWm::slotSwitchUser() { // kdDebug() << "KRootWm::slotSwitchUser" << endl; if (!sessionsMenu) return; - TQDesktopWidget* desktop = KApplication::desktop(); + TQDesktopWidget* desktop = TDEApplication::desktop(); TQRect r; if (desktop->numScreens() < 2) r = desktop->geometry(); @@ -830,7 +830,7 @@ void KRootWm::slotSave() { void KRootWm::slotLogout() { - m_pDesktop->logout(KApplication::ShutdownConfirmDefault, KApplication::ShutdownTypeDefault); + m_pDesktop->logout(TDEApplication::ShutdownConfirmDefault, TDEApplication::ShutdownTypeDefault); } void KRootWm::slotPopulateSessions() diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 111af852d..2c8650f85 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -97,7 +97,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 3 && args->count() != 4 ) diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 68d1c1943..61f3cfd4f 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -94,7 +94,7 @@ int main( int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KApplication app; + TDEApplication app; app.disableSessionManagement(); if (args->isSet( "xdgname" ) == true) { diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 5db594306..cd8f38da1 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -776,7 +776,7 @@ void LockProcess::startSecureDialog() } if (ret == 3) { trinity_desktop_lock_closing_windows = 1; - DCOPRef("ksmserver","ksmserver").send("logout", (int)KApplication::ShutdownConfirmYes, (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeInteractive); + DCOPRef("ksmserver","ksmserver").send("logout", (int)TDEApplication::ShutdownConfirmYes, (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeInteractive); kapp->quit(); } // FIXME diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 88c28d11b..89e29a5c0 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -149,7 +149,7 @@ bool MyApp::x11EventFilter( XEvent *ev ) } } #endif - return KApplication::x11EventFilter( ev ); + return TDEApplication::x11EventFilter( ev ); } @@ -213,7 +213,7 @@ int main( int argc, char **argv ) putenv(strdup("SESSION_MANAGER=")); - KApplication::disableAutoDcopRegistration(); // not needed + TDEApplication::disableAutoDcopRegistration(); // not needed XSetErrorHandler(trapXErrors); diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h index 23797e4b0..12db9ebca 100644 --- a/kdesktop/lock/main.h +++ b/kdesktop/lock/main.h @@ -24,10 +24,10 @@ #include -class MyApp : public KApplication { +class MyApp : public TDEApplication { Q_OBJECT public: - MyApp() : KApplication(), lastTick( 0 ) {} + MyApp() : TDEApplication(), lastTick( 0 ) {} protected: bool x11EventFilter( XEvent * ); signals: diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 51520b9e7..89b4bc69f 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -650,7 +650,7 @@ void Minicli::notifyServiceStarted(KService::Ptr service) TQDataStream stream(params, IO_WriteOnly); stream << "minicli" << service->storageId(); kdDebug() << "minicli appLauncher dcop signal: " << service->storageId() << endl; - KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", + TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher", "serviceStartedByStorageId(TQString,TQString)", params); } -- cgit v1.2.1