From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:21:02 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kded/kbuildsycoca.cpp |  6 +++---
 kded/kde-menu.cpp     |  6 +++---
 kded/kded.cpp         | 10 +++++-----
 kded/khostname.cpp    |  2 +-
 kded/kmimelist.cpp    |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'kded')

diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index ec5139d86..483578c72 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -736,11 +736,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
      setenv("TDEROOTHOME", "-", 1);
    }
 
-   KApplication::disableAutoDcopRegistration();
+   TDEApplication::disableAutoDcopRegistration();
 #ifdef KBUILDSYCOCA_GUI
-   KApplication k;
+   TDEApplication k;
 #else
-   KApplication k(false, false);
+   TDEApplication k(false, false);
 #endif
    k.disableSessionManagement();
 
diff --git a/kded/kde-menu.cpp b/kded/kde-menu.cpp
index 81887a695..7148a1e6b 100644
--- a/kded/kde-menu.cpp
+++ b/kded/kde-menu.cpp
@@ -121,8 +121,8 @@ int main(int argc, char **argv)
    TDECmdLineArgs::init(argc, argv, &d);
    TDECmdLineArgs::addCmdLineOptions(options);
 
-//   KApplication k(false, false);
-   KApplication k(false);
+//   TDEApplication k(false, false);
+   TDEApplication k(false);
    k.disableSessionManagement();
 
    // this program is in tdelibs so it uses tdelibs as catalog
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
       args.append("--incremental");
       args.append("--checkstamps");
       TQString command = "kbuildsycoca";
-      TQCString _launcher = KApplication::launcher();
+      TQCString _launcher = TDEApplication::launcher();
       if (!DCOPRef(_launcher, _launcher).call("tdeinit_exec_wait", command, args).isValid())
       {
          tqWarning("Can't talk to klauncher!");
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 40e1983f7..538cfff09 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -73,19 +73,19 @@ static void runBuildSycoca(TQObject *callBackObj=0, const char *callBackSlot=0)
       TQByteArray data;
       TQDataStream dataStream( data, IO_WriteOnly );
       dataStream << TQString("kbuildsycoca") << args;
-      TQCString _launcher = KApplication::launcher();
+      TQCString _launcher = TDEApplication::launcher();
 
       kapp->dcopClient()->callAsync(_launcher, _launcher, "tdeinit_exec_wait(TQString,TQStringList)", data, callBackObj, callBackSlot);
    }
    else
    {
-      KApplication::tdeinitExecWait( "kbuildsycoca", args );
+      TDEApplication::tdeinitExecWait( "kbuildsycoca", args );
    }
 }
 
 static void runKonfUpdate()
 {
-   KApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
+   TDEApplication::tdeinitExecWait( "kconf_update", TQStringList(), 0, 0, "0" /*no startup notification*/ );
 }
 
 static void runDontChangeHostname(const TQCString &oldName, const TQCString &newName)
@@ -93,7 +93,7 @@ static void runDontChangeHostname(const TQCString &oldName, const TQCString &new
    TQStringList args;
    args.append(TQFile::decodeName(oldName));
    args.append(TQFile::decodeName(newName));
-   KApplication::tdeinitExecWait( "kdontchangethehostname", args );
+   TDEApplication::tdeinitExecWait( "kdontchangethehostname", args );
 }
 
 Kded::Kded(bool checkUpdates, bool new_startup)
@@ -876,7 +876,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
         "$Id$",
         I18N_NOOP("TDE Daemon - triggers Sycoca database updates when needed"));
 
-     KApplication::installSigpipeHandler();
+     TDEApplication::installSigpipeHandler();
 
      TDECmdLineArgs::init(argc, argv, &aboutData);
 
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 60c7ba8f5..0c1dd1b18 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -358,7 +358,7 @@ void KHostName::changeSessionManager()
       delete client;
       return;
    }
-   TQCString launcher = KApplication::launcher();
+   TQCString launcher = TDEApplication::launcher();
    client->send(launcher, launcher, "setLaunchEnv(TQCString,TQCString)", params);
    delete client;
 }
diff --git a/kded/kmimelist.cpp b/kded/kmimelist.cpp
index fff626cac..c82f6d9f7 100644
--- a/kded/kmimelist.cpp
+++ b/kded/kmimelist.cpp
@@ -14,7 +14,7 @@
 
 int main(int argc, char *argv[])
 {
-   KApplication k(argc,argv,"blurb",false);
+   TDEApplication k(argc,argv,"blurb",false);
 
    KMimeType::List mtl = KMimeType::allMimeTypes( );
    assert( mtl.count() );
-- 
cgit v1.2.3