Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

8 files changed, 24 insertions, 24 deletions

diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp
index a45bdabb5..3708a9dd1 100644
--- a/kicker/menuext/find/findmenu.cpp
+++ b/kicker/menuext/find/findmenu.cpp
@@ -67,13 +67,13 @@ void FindMenu::slotExec( int pos )
 {
   TQString app = mConfigList[ pos ];
 
-  kapp->propagateSessionManager();
+  tdeApp->propagateSessionManager();
 
   KSimpleConfig config(app, true);
   config.setDesktopGroup();
-  if (kapp && config.readEntry("Type") == "Link")
+  if (tdeApp && config.readEntry("Type") == "Link")
   {
-    kapp->invokeBrowser(config.readEntry("URL"));
+    tdeApp->invokeBrowser(config.readEntry("URL"));
   }
   else
   {
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 089a8ac93..a8f16053a 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -167,7 +167,7 @@ void KateSessionMenu::slotExec( int id )
   else if ( id > 2 )
     args << m_sessions[ id-3 ];
 
-  kapp->tdeinitExec("kate", args);
+  tdeApp->tdeinitExec("kate", args);
 }
 
 void KateSessionMenu::reloadSessionsList()
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index 321d9ac59..85f85b7bc 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id)
 {
    TQStringList args;
    args<<"--profile"<<m_profiles[id-1];
-   kapp->tdeinitExec("konqueror", args);
+   tdeApp->tdeinitExec("konqueror", args);
 }
 
 void KonquerorProfilesMenu::reload()
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index 2e196186f..17ca9d629 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -91,7 +91,7 @@ void KonsoleMenu::initialize()
     }
     else
     {
-        kapp->iconLoader()->addAppDir("konsole");
+        tdeApp->iconLoader()->addAppDir("konsole");
     }
 
     setInitialized(true);
@@ -244,7 +244,7 @@ void KonsoleMenu::slotExec(int id)
     }
 
     --id;
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     TQStringList args;
     if (static_cast<unsigned int>(id) < sessionList.count())
     {
@@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id)
     // this is a session, not a bookmark, so execute that instead
    TQStringList args;
    args << "--profile" << m_profiles[id];
-   kapp->tdeinitExec("konsole", args);
+   tdeApp->tdeinitExec("konsole", args);
 }
 
 KURL KonsoleMenu::baseURL() const
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 5440c1ed7..97da9b986 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -328,7 +328,7 @@ void PrefMenu::slotExec(int id)
         return;
     }
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     KSycocaEntry *e = m_entryMap[id];
     KService::Ptr service = static_cast<KService *>(e);
     TDEApplication::startServiceByDesktopPath(service->desktopEntryPath(),
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index 90c84ee32..65834db13 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -96,7 +96,7 @@ void RecentDocsMenu::slotClearHistory() {
 
 void RecentDocsMenu::slotExec(int id) {
 	if (id >= 0) {
-		kapp->propagateSessionManager();
+		tdeApp->propagateSessionManager();
 		KURL u;
 		u.setPath(_fileList[id]);
 		KDEDesktopMimeType::run(u, true);
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index 3a1b31145..c0ca57d7c 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID)
     switch (ID)
     {
         case ADD_PRINTER_ID:
-            kapp->tdeinitExec("kaddprinterwizard");
+            tdeApp->tdeinitExec("kaddprinterwizard");
             break;
         case TDEPRINT_SETTINGS_ID:
-	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
+	    tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--tdeconfig"));
             break;
 	case CONFIG_SERVER_ID:
-	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
+	    tdeApp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
 	    break;
         case PRINT_MANAGER_ID:
             KRun::runCommand("tdecmshell tde-printers.desktop");
@@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID)
             KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
             break;
 	case KPRINTER_ID:
-	    kapp->tdeinitExec("kprinter");
+	    tdeApp->tdeinitExec("kprinter");
 	    break;
         default:
             {
                 // start kjobviewer
                 TQStringList args;
                 args << "--show" << "-d" << text(ID).remove('&');
-                kapp->tdeinitExec("kjobviewer", args);
+                tdeApp->tdeinitExec("kjobviewer", args);
             }
             break;
     }
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 3e97cf385..17d1a8b01 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
             TQPainter p(this);
             TQRect r(rect());
             // ew, nasty hack. may result in coredumps due to horrid C-style cast???
-            kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
+            tdeApp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled,
                                       TQStyleOption(static_cast<TQMenuItem*>(this), 0, TDEIcon::SizeMedium ));
             p.drawPixmap(KDialog::spacingHint(), 1, icon);
             p.drawText((KDialog::spacingHint() * 2) + TDEIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:"));
@@ -432,7 +432,7 @@ void TOM::initialize()
     }
     else
     {
-      connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
+      connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged()));
     }*/
 
     // TASKS
@@ -484,7 +484,7 @@ void TOM::initialize()
     {
         removeItem(destMenuTitleID);
     }
-    else if (kapp->authorize("run_command"))
+    else if (tdeApp->authorize("run_command"))
     {
         insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
@@ -510,7 +510,7 @@ void TOM::initialize()
     insertTitle(i18n("Special Items"), contextMenuTitleID);
 
     // if we have no destinations, put the run command here
-    if (numDests == 0 && kapp->authorize("run_command"))
+    if (numDests == 0 && tdeApp->authorize("run_command"))
     {
         insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand()));
     }
@@ -817,8 +817,8 @@ void TOM::runCommand()
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
 
-    kapp->updateRemoteUserTimestamp( appname );
-    kapp->dcopClient()->send( appname, "KDesktopIface",
+    tdeApp->updateRemoteUserTimestamp( appname );
+    tdeApp->dcopClient()->send( appname, "KDesktopIface",
                               "popupExecuteCommand()", data );
 }
 
@@ -826,7 +826,7 @@ void TOM::runTask(int id)
 {
     if (!m_tasks.contains(id)) return;
 
-    kapp->propagateSessionManager();
+    tdeApp->propagateSessionManager();
     TDEApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(),
       TQStringList(), 0, 0, 0, "", true);
 }
@@ -840,7 +840,7 @@ void TOM::openRecentDocument(int id)
 {
     if (id >= 0)
     {
-        kapp->propagateSessionManager();
+        tdeApp->propagateSessionManager();
         KURL u;
         u.setPath(m_recentDocURLs[id]);
         KDEDesktopMimeType::run(u, true);
@@ -849,7 +849,7 @@ void TOM::openRecentDocument(int id)
 
 void TOM::logout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 #include "tom.moc"