Rename KInstance and KAboutData to avoid conflicts with KDE4

10 files changed, 46 insertions, 46 deletions

diff --git a/sip/tdecore/kaboutdata.sip b/sip/tdecore/kaboutdata.sip
index 8b3f5a1..eb75fed 100644
--- a/sip/tdecore/kaboutdata.sip
+++ b/sip/tdecore/kaboutdata.sip
@@ -57,7 +57,7 @@ public:
 };  // class KAboutTranslator
 
 
-class KAboutData
+class TDEAboutData
 {
 %TypeHeaderCode
 #include <kaboutdata.h>
@@ -83,7 +83,7 @@ public:
 
 
 public:
-                         KAboutData (const char*, const char*, const char*, const char* = 0, int = License_Unknown , const char* = 0, const char* = 0, const char* = 0, const char* = "submit@bugs.kde.org");
+                         TDEAboutData (const char*, const char*, const char*, const char* = 0, int = License_Unknown , const char* = 0, const char* = 0, const char* = 0, const char* = "submit@bugs.kde.org");
     void                 addAuthor (const char*, const char* = 0, const char* = 0, const char* = 0);
     void                 addCredit (const char*, const char* = 0, const char* = 0, const char* = 0);
     void                 setTranslator (const char*, const char*);
@@ -100,7 +100,7 @@ public:
 
     void                 setVersion (const char*);
     void                 setShortDescription (const char*);
-    void                 setLicense (KAboutData::LicenseKey);
+    void                 setLicense (TDEAboutData::LicenseKey);
     void                 setCopyrightStatement (const char*);
     void                 setOtherText (const char*);
     void                 setHomepage (const char*);
@@ -161,7 +161,7 @@ public:
 %End
 
 
-};  // class KAboutData
+};  // class TDEAboutData
 
 
 
diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip
index 5306a5e..59e99a0 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 TDEApplication : TQApplication, KInstance
+class TDEApplication : TQApplication, TDEInstance
 {
 %TypeHeaderCode
 #include <kapplication.h>
@@ -291,10 +291,10 @@ public slots:
     void                 deref ();
 
 protected:
-                         TDEApplication (bool, bool, KInstance*);
+                         TDEApplication (bool, bool, TDEInstance*);
 
 %If ( KDE_3_3_0 -  )
-//ig                          TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, KInstance*);
+//ig                          TDEApplication (Display*, TQt::HANDLE, TQt::HANDLE, bool, TDEInstance*);
 %End
 
 //ig     bool                 x11EventFilter (XEvent*);
diff --git a/sip/tdecore/kcmdlineargs.sip b/sip/tdecore/kcmdlineargs.sip
index 7a29bc1..f716f68 100644
--- a/sip/tdecore/kcmdlineargs.sip
+++ b/sip/tdecore/kcmdlineargs.sip
@@ -107,9 +107,9 @@ public:
     updatePyArgv (a0, argc, argv);
 %End
 
-    static void          init (SIP_PYLIST, const KAboutData*, bool = 0) [void (int, char**, const KAboutData*, bool = 0)];
+    static void          init (SIP_PYLIST, const TDEAboutData*, bool = 0) [void (int, char**, const TDEAboutData*, bool = 0)];
 %MethodCode
-//takes  _argv | (a Python list of strings which may be modified) | about | (KAboutData) | noKApp | (bool = 0)
+//takes  _argv | (a Python list of strings which may be modified) | about | (TDEAboutData) | noKApp | (bool = 0)
 
     int argc, nargc; //, iserr = 0;
     char **argv;
@@ -131,7 +131,7 @@ public:
     updatePyArgv (a0, argc, argv);
 %End
 
-    static void          init (const KAboutData*);
+    static void          init (const TDEAboutData*);
     static void          addCmdLineOptions (SIP_PYLIST, const char* = 0, const char* = 0, const char* = 0) [void (const KCmdLineOptions*, const char* = 0, const char* = 0, const char* = 0)];
 %MethodCode
 //takes options  | (a Python list of tuples) | name | (char = 0) | id | (char = 0) | afterId | (char = 0)
diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index 849bb07..7a03345 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -32,7 +32,7 @@ class KGlobal
 
 
 public:
-    static KInstance*    instance ();
+    static TDEInstance*    instance ();
     static KStandardDirs* dirs ();
     static KConfig*      config ();
 
@@ -49,13 +49,13 @@ public:
     static void          unregisterStaticDeleter (KStaticDeleterBase*);
     static void          deleteStaticDeleters ();
 //ig     KStringDict*         _stringDict;
-//ig     KInstance*           _instance;
+//ig     TDEInstance*           _instance;
 //ig     KLocale*             _locale;
 //ig     KCharsets*           _charsets;
 //ig     KStaticDeleterList*  _staticDeleters;
-    static void          setActiveInstance (KInstance*);
-    static KInstance*    activeInstance ();
-//ig     KInstance*           _activeInstance;
+    static void          setActiveInstance (TDEInstance*);
+    static TDEInstance*    activeInstance ();
+//ig     TDEInstance*           _activeInstance;
 
 };  // class KGlobal
 
diff --git a/sip/tdecore/kiconloader.sip b/sip/tdecore/kiconloader.sip
index 23f4fcc..bf62f2e 100644
--- a/sip/tdecore/kiconloader.sip
+++ b/sip/tdecore/kiconloader.sip
@@ -79,19 +79,19 @@ public:
 #include <kiconloader.h>
 %End
 
-TQPixmap              DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap              DesktopIcon (const TQString&, KInstance*);
-TQIconSet             DesktopIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap              BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap              BarIcon (const TQString&, KInstance*);
-TQIconSet             BarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap              SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap              SmallIcon (const TQString&, KInstance*);
-TQIconSet             SmallIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap              MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap              MainBarIcon (const TQString&, KInstance*);
-TQIconSet             MainBarIconSet (const TQString&, int = 0, KInstance* = KGlobal ::instance ());
-TQPixmap              UserIcon (const TQString&, int = KIcon ::DefaultState , KInstance* = KGlobal ::instance ());
-TQPixmap              UserIcon (const TQString&, KInstance*);
-TQIconSet             UserIconSet (const TQString&, KInstance* = KGlobal ::instance ());
-int                  IconSize (KIcon::Group, KInstance* = KGlobal ::instance ());
+TQPixmap              DesktopIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap              DesktopIcon (const TQString&, TDEInstance*);
+TQIconSet             DesktopIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap              BarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap              BarIcon (const TQString&, TDEInstance*);
+TQIconSet             BarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap              SmallIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap              SmallIcon (const TQString&, TDEInstance*);
+TQIconSet             SmallIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap              MainBarIcon (const TQString&, int = 0, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap              MainBarIcon (const TQString&, TDEInstance*);
+TQIconSet             MainBarIconSet (const TQString&, int = 0, TDEInstance* = KGlobal ::instance ());
+TQPixmap              UserIcon (const TQString&, int = KIcon ::DefaultState , TDEInstance* = KGlobal ::instance ());
+TQPixmap              UserIcon (const TQString&, TDEInstance*);
+TQIconSet             UserIconSet (const TQString&, TDEInstance* = KGlobal ::instance ());
+int                  IconSize (KIcon::Group, TDEInstance* = KGlobal ::instance ());
diff --git a/sip/tdecore/kinstance.sip b/sip/tdecore/kinstance.sip
index 5ee05ee..beadd9d 100644
--- a/sip/tdecore/kinstance.sip
+++ b/sip/tdecore/kinstance.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KInstance
+class TDEInstance
 {
 %TypeHeaderCode
 #include <kinstance.h>
@@ -32,9 +32,9 @@ class KInstance
 
 
 public:
-                         KInstance (const TQCString&);
-                         KInstance (const KAboutData*);
-                         KInstance (KInstance*);
+                         TDEInstance (const TQCString&);
+                         TDEInstance (const TDEAboutData*);
+                         TDEInstance (TDEInstance*);
     KStandardDirs*       dirs () const;
     KConfig*             config () const;
 
@@ -44,12 +44,12 @@ public:
 
     KIconLoader*         iconLoader () const;
     void                 newIconLoader () const;
-    const KAboutData*    aboutData () const;
+    const TDEAboutData*    aboutData () const;
     TQCString             instanceName () const;
     KMimeSourceFactory*  mimeSourceFactory () const;
 
 protected:
-//ig                          KInstance (const KInstance&);
+//ig                          TDEInstance (const TDEInstance&);
 
 %If ( KDE_3_1_0 -  )
     void                 setConfigName (const TQString&);
@@ -68,8 +68,8 @@ public:
 //force
 
 private:
-                         KInstance (const KInstance&);
+                         TDEInstance (const TDEInstance&);
 //end
 
-};  // class KInstance
+};  // class TDEInstance
 
diff --git a/sip/tdecore/klibloader.sip b/sip/tdecore/klibloader.sip
index 27c8e72..d068558 100644
--- a/sip/tdecore/klibloader.sip
+++ b/sip/tdecore/klibloader.sip
@@ -68,7 +68,7 @@ public:
     virtual void         unloadLibrary (const char*);
     static KLibLoader*   self ();
     static void          cleanUp ();
-    static TQString       findLibrary (const char*, const KInstance* = KGlobal ::instance ());
+    static TQString       findLibrary (const char*, const TDEInstance* = KGlobal ::instance ());
 
 protected:
                          KLibLoader (TQObject* /TransferThis/ = 0, const char* = 0);
diff --git a/sip/tdecore/knotifyclient.sip b/sip/tdecore/knotifyclient.sip
index d0aeb62..5320ff8 100644
--- a/sip/tdecore/knotifyclient.sip
+++ b/sip/tdecore/knotifyclient.sip
@@ -38,9 +38,9 @@ class Instance
 
 
 public:
-                         Instance (KInstance*);
+                         Instance (TDEInstance*);
     bool                 useSystemBell () const;
-    static KInstance*    current ();
+    static TDEInstance*    current ();
     static KNotifyClient::Instance* currentInstance ();
 
 };  // class Instance
@@ -102,7 +102,7 @@ int                  getPresentation (const TQString&);
 TQString              getFile (const TQString&, int);
 int                  getDefaultPresentation (const TQString&);
 TQString              getDefaultFile (const TQString&, int);
-KInstance*           instance ();
+TDEInstance*           instance ();
 
 %If ( KDE_3_1_0 - KDE_3_2_0 )
 
diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip
index ee3c6fc..8c44662 100644
--- a/sip/tdecore/kshortcutlist.sip
+++ b/sip/tdecore/kshortcutlist.sip
@@ -46,7 +46,7 @@ public:
     virtual bool         isGlobal (uint) const;
     virtual int          index (const TQString&) const;
     virtual int          index (const KKeySequence&) const;
-    virtual const KInstance* instance () const;
+    virtual const TDEInstance* instance () const;
 
     enum Other
     {
diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip
index a066ec9..7922a4e 100644
--- a/sip/tdecore/kstddirs.sip
+++ b/sip/tdecore/kstddirs.sip
@@ -65,5 +65,5 @@ private:
 #include <kstddirs.h>
 %End
 
-TQString              locate (const char*, const TQString&, const KInstance* = KGlobal::instance());
-TQString              locateLocal (const char*, const TQString&, const KInstance* = KGlobal::instance());
+TQString              locate (const char*, const TQString&, const TDEInstance* = KGlobal::instance());
+TQString              locateLocal (const char*, const TQString&, const TDEInstance* = KGlobal::instance());