Rename KStartup for enhanced compatibility with KDE4

3 files changed, 38 insertions, 38 deletions

diff --git a/sip/kio/krun.sip b/sip/kio/krun.sip
index 4cfc58d..249dd09 100644
--- a/sip/kio/krun.sip
+++ b/sip/kio/krun.sip
@@ -185,7 +185,7 @@ public:
     static pid_t         run (TDEProcess*, const TQString&);
 
 %If ( KDE_3_1_4 -  )
-    static pid_t         run (TDEProcess*, const TQString&, const KStartupInfoId&);
+    static pid_t         run (TDEProcess*, const TQString&, const TDEStartupInfoId&);
 %End
 
     pid_t                pid () const;
@@ -197,7 +197,7 @@ private:
                          TDEProcessRunner (TDEProcess*, const TQString&);
 
 %If ( KDE_3_1_4 -  )
-                         TDEProcessRunner (TDEProcess*, const TQString&, const KStartupInfoId&);
+                         TDEProcessRunner (TDEProcess*, const TQString&, const TDEStartupInfoId&);
 %End
 
                          TDEProcessRunner ();
diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip
index c6940e6..36a1c81 100644
--- a/sip/tdecore/kaccel.sip
+++ b/sip/tdecore/kaccel.sip
@@ -142,7 +142,7 @@ public:
         {sipName_KShellProcess,           &sipClass_KShellProcess},
         {sipName_KSimpleConfig,           &sipClass_KSimpleConfig},
         {sipName_TDESocket,                 &sipClass_TDESocket},
-        {sipName_KStartupInfo,            &sipClass_KStartupInfo},
+        {sipName_TDEStartupInfo,            &sipClass_TDEStartupInfo},
         {sipName_KUniqueApplication,      &sipClass_KUniqueApplication},
         {sipName_KWinModule,              &sipClass_KWinModule},
     };
diff --git a/sip/tdecore/kstartupinfo.sip b/sip/tdecore/kstartupinfo.sip
index 06aab35..53dfa03 100644
--- a/sip/tdecore/kstartupinfo.sip
+++ b/sip/tdecore/kstartupinfo.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-class KStartupInfo : TQObject
+class TDEStartupInfo : TQObject
 {
 %TypeHeaderCode
 #include <kstartupinfo.h>
@@ -62,16 +62,16 @@ public:
 
 %End
 
-                         KStartupInfo (bool, TQObject* /TransferThis/ = 0, const char* = 0);
-    static bool          sendStartup (const KStartupInfoId&, const KStartupInfoData&);
-//ig     static bool          sendStartupX (Display*, const KStartupInfoId&, const KStartupInfoData&);
-    static bool          sendChange (const KStartupInfoId&, const KStartupInfoData&);
-//ig     static bool          sendChangeX (Display*, const KStartupInfoId&, const KStartupInfoData&);
-    static bool          sendFinish (const KStartupInfoId&);
-//ig     static bool          sendFinishX (Display*, const KStartupInfoId&);
-    static bool          sendFinish (const KStartupInfoId&, const KStartupInfoData&);
-//ig     static bool          sendFinishX (Display*, const KStartupInfoId&, const KStartupInfoData&);
-    static KStartupInfoId currentStartupIdEnv ();
+                         TDEStartupInfo (bool, TQObject* /TransferThis/ = 0, const char* = 0);
+    static bool          sendStartup (const TDEStartupInfoId&, const TDEStartupInfoData&);
+//ig     static bool          sendStartupX (Display*, const TDEStartupInfoId&, const TDEStartupInfoData&);
+    static bool          sendChange (const TDEStartupInfoId&, const TDEStartupInfoData&);
+//ig     static bool          sendChangeX (Display*, const TDEStartupInfoId&, const TDEStartupInfoData&);
+    static bool          sendFinish (const TDEStartupInfoId&);
+//ig     static bool          sendFinishX (Display*, const TDEStartupInfoId&);
+    static bool          sendFinish (const TDEStartupInfoId&, const TDEStartupInfoData&);
+//ig     static bool          sendFinishX (Display*, const TDEStartupInfoId&, const TDEStartupInfoData&);
+    static TDEStartupInfoId currentStartupIdEnv ();
     static void          resetStartupEnv ();
 
     enum startup_t
@@ -81,10 +81,10 @@ public:
         CantDetect
     };
 
-    KStartupInfo::startup_t checkStartup (WId);
-    KStartupInfo::startup_t checkStartup (WId, KStartupInfoId&);
-    KStartupInfo::startup_t checkStartup (WId, KStartupInfoData&);
-    KStartupInfo::startup_t checkStartup (WId, KStartupInfoId&, KStartupInfoData&);
+    TDEStartupInfo::startup_t checkStartup (WId);
+    TDEStartupInfo::startup_t checkStartup (WId, TDEStartupInfoId&);
+    TDEStartupInfo::startup_t checkStartup (WId, TDEStartupInfoData&);
+    TDEStartupInfo::startup_t checkStartup (WId, TDEStartupInfoId&, TDEStartupInfoData&);
     void                 setTimeout (uint);
     static void          setWindowStartupId (WId, const TQCString&);
     static TQCString      windowStartupId (WId);
@@ -95,17 +95,17 @@ public:
 
 
 signals:
-    void                 gotNewStartup (const KStartupInfoId&, const KStartupInfoData&);
-    void                 gotStartupChange (const KStartupInfoId&, const KStartupInfoData&);
-    void                 gotRemoveStartup (const KStartupInfoId&, const KStartupInfoData&);
+    void                 gotNewStartup (const TDEStartupInfoId&, const TDEStartupInfoData&);
+    void                 gotStartupChange (const TDEStartupInfoId&, const TDEStartupInfoData&);
+    void                 gotRemoveStartup (const TDEStartupInfoId&, const TDEStartupInfoData&);
 
 protected:
     virtual void         customEvent (TQCustomEvent*);
 
-};  // class KStartupInfo
+};  // class TDEStartupInfo
 
 
-class KStartupInfoId
+class TDEStartupInfoId
 {
 %TypeHeaderCode
 #include <kstartupinfo.h>
@@ -115,8 +115,8 @@ class KStartupInfoId
 public:
 
 %If ( KDE_3_1_4 -  )
-    bool                 operator == (const KStartupInfoId&) const;
-    bool                 operator != (const KStartupInfoId&) const;
+    bool                 operator == (const TDEStartupInfoId&) const;
+    bool                 operator != (const TDEStartupInfoId&) const;
 %End
 
     bool                 none () const;
@@ -128,21 +128,21 @@ public:
 %End
 
     bool                 setupStartupEnv () const;
-                         KStartupInfoId ();
-                         KStartupInfoId (const KStartupInfoId&);
+                         TDEStartupInfoId ();
+                         TDEStartupInfoId (const TDEStartupInfoId&);
 
 %If ( KDE_3_1_4 -  )
-    bool                 operator < (const KStartupInfoId&) const;
+    bool                 operator < (const TDEStartupInfoId&) const;
 %End
 
 
 private:
-                         KStartupInfoId (const TQString&);
+                         TDEStartupInfoId (const TQString&);
 
-};  // class KStartupInfoId
+};  // class TDEStartupInfoId
 
 
-class KStartupInfoData
+class TDEStartupInfoData
 {
 %TypeHeaderCode
 #include <kstartupinfo.h>
@@ -185,8 +185,8 @@ public:
         Unknown
     };
 
-    void                 setSilent (KStartupInfoData::TriState);
-    KStartupInfoData::TriState silent () const;
+    void                 setSilent (TDEStartupInfoData::TriState);
+    TDEStartupInfoData::TriState silent () const;
 
 %If ( KDE_3_2_0 -  )
     void                 setTimestamp (ulong);
@@ -197,14 +197,14 @@ public:
 
 %End
 
-    void                 update (const KStartupInfoData&);
-                         KStartupInfoData ();
-                         KStartupInfoData (const KStartupInfoData&);
+    void                 update (const TDEStartupInfoData&);
+                         TDEStartupInfoData ();
+                         TDEStartupInfoData (const TDEStartupInfoData&);
 
 private:
-                         KStartupInfoData (const TQString&);
+                         TDEStartupInfoData (const TQString&);
 
-};  // class KStartupInfoData
+};  // class TDEStartupInfoData
 
 /*%MappedType TQValueList<pid_t>
 //converts a Python list of long