Rename KApplication to TDEApplication to avoid conflicts with KDE4

5 files changed, 17 insertions, 17 deletions

diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 25263e872..cd023eb8a 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -44,7 +44,7 @@ HideButton::HideButton(TQWidget *parent, const char *name)
     kapp->addKipcEventMask(KIPC::SettingsChanged);
     kapp->addKipcEventMask(KIPC::IconChanged);
 
-    slotSettingsChanged(KApplication::SETTINGS_MOUSE);
+    slotSettingsChanged(TDEApplication::SETTINGS_MOUSE);
 }
 
 void HideButton::drawButton(TQPainter *p)
@@ -148,7 +148,7 @@ void HideButton::generateIcons()
 
 void HideButton::slotSettingsChanged(int category)
 {
-    if (category != KApplication::SETTINGS_MOUSE)
+    if (category != TDEApplication::SETTINGS_MOUSE)
     {
         return;
     }
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 702c92173..48ef522fd 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -87,7 +87,7 @@ PanelKMenu::PanelKMenu()
     setCaption(i18n("TDE Menu"));
     connect(Kicker::the(), TQT_SIGNAL(configurationChanged()),
             this, TQT_SLOT(configChanged()));
-    DCOPClient *dcopClient = KApplication::dcopClient();
+    DCOPClient *dcopClient = TDEApplication::dcopClient();
     dcopClient->connectDCOPSignal(0, "appLauncher",
         "serviceStartedByStorageId(TQString,TQString)",
         dcopObjId,
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index e8a51fe28..eb7fc8114 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -2554,7 +2554,7 @@ void KMenu::slotStartService(KService::Ptr ptr)
     accept();
 
     addToHistory();
-    KApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(ptr->desktopEntryPath(),
                                             TQStringList(), 0, 0, 0, "", true);
     updateRecentlyUsedApps(ptr);
 }
@@ -2587,12 +2587,12 @@ void KMenu::slotStartURL(const TQString& u)
         kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
 #else
         DCOPRef mediamanager("ksmserver", "ksmserver");
-        DCOPReply reply = mediamanager.call( "logoutTimed", (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeDefault );
+        DCOPReply reply = mediamanager.call( "logoutTimed", (int)TDEApplication::ShutdownTypeNone, (int)TDEApplication::ShutdownModeDefault );
 	if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"),
                                                                                           i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo")))
-            kapp->requestShutDown( KApplication::ShutdownConfirmNo,
-                                   KApplication::ShutdownTypeNone,
-                                   KApplication::ShutdownModeDefault );
+            kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+                                   TDEApplication::ShutdownTypeNone,
+                                   TDEApplication::ShutdownModeDefault );
 
 #endif
     }
@@ -2610,9 +2610,9 @@ void KMenu::slotStartURL(const TQString& u)
 #else
         if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"),
                                                                       i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit")))
-            kapp->requestShutDown( KApplication::ShutdownConfirmNo,
-                                   KApplication::ShutdownTypeHalt,
-                                   KApplication::ShutdownModeDefault );
+            kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+                                   TDEApplication::ShutdownTypeHalt,
+                                   TDEApplication::ShutdownModeDefault );
 #endif
     }
     else if ( u == "kicker:/restart" ) {
@@ -2625,9 +2625,9 @@ void KMenu::slotStartURL(const TQString& u)
 #else
         if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"),
                                                                       i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload")))
-            kapp->requestShutDown( KApplication::ShutdownConfirmNo,
-                                   KApplication::ShutdownTypeReboot,
-                                   KApplication::ShutdownModeDefault );
+            kapp->requestShutDown( TDEApplication::ShutdownConfirmNo,
+                                   TDEApplication::ShutdownTypeReboot,
+                                   TDEApplication::ShutdownModeDefault );
 #endif
     }
 #ifdef KDELIBS_SUSE
@@ -3197,7 +3197,7 @@ void KMenu::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);
 }
 
diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp
index 473b0cdf2..6e3802fe0 100644
--- a/kicker/kicker/ui/recentapps.cpp
+++ b/kicker/kicker/ui/recentapps.cpp
@@ -112,7 +112,7 @@ void RecentlyLaunchedApps::appLaunched(const TQString& strApp)
     TQByteArray params;
     TQDataStream stream(params, IO_WriteOnly);
     stream << launchDCOPSignalSource() << strApp;
-    KApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
+    TDEApplication::kApplication()->dcopClient()->emitDCOPSignal("appLauncher",
         "serviceStartedByStorageId(TQString,TQString)", params);
 
     for (TQValueList<RecentlyLaunchedAppInfo>::iterator it = m_appInfos.begin();
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 6cb184c72..8a483f086 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -554,7 +554,7 @@ void PanelServiceMenu::slotExec(int id)
     kapp->propagateSessionManager();
 
     KService::Ptr service = static_cast<KService *>(e);
-    KApplication::startServiceByDesktopPath(service->desktopEntryPath(),
+    TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
       TQStringList(), 0, 0, 0, "", true);
 
     updateRecentlyUsedApps(service);