Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 15 insertions, 15 deletions

diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip
index a91fa25..23f7f75 100644
--- a/sip/tdecore/kaccel.sip
+++ b/sip/tdecore/kaccel.sip
@@ -118,7 +118,7 @@ public:
 
     static sipStringTypeClassMap map[] = {
         {sipName_KAccel,                  &sipClass_KAccel},
-        {sipName_KApplication,            &sipClass_KApplication},
+        {sipName_TDEApplication,            &sipClass_TDEApplication},
         {sipName_KAsyncIO,                &sipClass_KAsyncIO},
         {sipName_KAudioPlayer,            &sipClass_KAudioPlayer},
         {sipName_KBufferedIO,             &sipClass_KBufferedIO},
diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip
index e7ab9e1..95b3212 100644
--- a/sip/tdecore/kapplication.sip
+++ b/sip/tdecore/kapplication.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KApplication : TQApplication, KInstance
+class TDEApplication : TQApplication, KInstance
 {
 %TypeHeaderCode
 #include <kapplication.h>
@@ -43,14 +43,14 @@ public:
         CaptionNoApp
     };
 
-                         KApplication (bool = 1, bool = 1);
+                         TDEApplication (bool = 1, bool = 1);
 
 %If ( KDE_3_3_0 -  )
-//ig                          KApplication (Display*, TQt::HANDLE = 0, TQt::HANDLE = 0, bool = 1);
+//ig                          TDEApplication (Display*, TQt::HANDLE = 0, TQt::HANDLE = 0, bool = 1);
 %End
 
-//ig                          KApplication (Display*, int&, char**, const TQCString&, bool = 1, bool = 1);
-                         KApplication (SIP_PYLIST, TQCString&, bool = 1, bool = 1) [(int&, char**, const TQCString&, bool = 1, bool = 1)];
+//ig                          TDEApplication (Display*, int&, char**, const TQCString&, bool = 1, bool = 1);
+                         TDEApplication (SIP_PYLIST, TQCString&, bool = 1, bool = 1) [(int&, char**, const TQCString&, bool = 1, bool = 1)];
 %MethodCode
 //takes argv | (a Python list of strings) | rAppName | (Python string) | allowStyles | (bool = 1)  | GUIenabled | (bool = 1)
 
@@ -71,10 +71,10 @@ public:
         // The following two lines simulate the actual ctor call
         // which is commented out below
         KCmdLineArgs::init (nargc, argv, (char *)"unknown", (char *)"KDE Application", NULL, false);
-        sipCpp = new sipKApplication((bool)a1,(bool)a2);
+        sipCpp = new sipTDEApplication((bool)a1,(bool)a2);
 
         // This method calls KCmdLineArgs::initIgnore, which is a private method
-//        sipCpp = new sipKApplication (nargc,argv, qc, a1, a2);
+//        sipCpp = new sipTDEApplication (nargc,argv, qc, a1, a2);
 
         Py_END_ALLOW_THREADS
 
@@ -84,7 +84,7 @@ public:
 %End
 
     static void          addCmdLineOptions ();
-    static KApplication* kApplication ();
+    static TDEApplication* kApplication ();
     KConfig*             sessionConfig ();
     bool                 isRestored () const;
     void                 disableSessionManagement ();
@@ -120,7 +120,7 @@ public:
         ShutdownModeInteractive
     };
 
-    bool                 requestShutDown (KApplication::ShutdownConfirm = ShutdownConfirmDefault , KApplication::ShutdownType = ShutdownTypeDefault , KApplication::ShutdownMode = ShutdownModeDefault );
+    bool                 requestShutDown (TDEApplication::ShutdownConfirm = ShutdownConfirmDefault , TDEApplication::ShutdownType = ShutdownTypeDefault , TDEApplication::ShutdownMode = ShutdownModeDefault );
     void                 propagateSessionManager ();
     void                 commitData (TQSessionManager&);
     void                 saveState (TQSessionManager&);
@@ -291,10 +291,10 @@ public slots:
     void                 deref ();
 
 protected:
-                         KApplication (bool, bool, KInstance*);
+                         TDEApplication (bool, bool, KInstance*);
 
 %If ( KDE_3_3_0 -  )
-//ig                          KApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, KInstance*);
+//ig                          TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, KInstance*);
 %End
 
 //ig     bool                 x11EventFilter (XEvent*);
@@ -357,7 +357,7 @@ signals:
     void                 shutDown ();
 
 private:
-                         KApplication (const KApplication&);
+                         TDEApplication (const TDEApplication&);
 
 protected:
 //igx     virtual void         virtual_hook (int, void*);
@@ -369,7 +369,7 @@ public:
 %End
 
 
-};  // class KApplication
+};  // class TDEApplication
 
 
 class KSessionManaged
diff --git a/sip/tdecore/kuniqueapplication.sip b/sip/tdecore/kuniqueapplication.sip
index 0bc5476..972c3cd 100644
--- a/sip/tdecore/kuniqueapplication.sip
+++ b/sip/tdecore/kuniqueapplication.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KUniqueApplication : KApplication, DCOPObject
+class KUniqueApplication : TDEApplication, DCOPObject
 {
 %TypeHeaderCode
 #include <kuniqueapp.h>