From c8cefea21c7cb4b007bbf43fcad66e29114baa28 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 21:48:26 -0600 Subject: [PATCH] Rename KStartup for enhanced compatibility with KDE4 --- doc/classref/allclasses.html | 6 +- doc/classref/kio/TDEProcessRunner.html | 4 +- ...{KStartupInfo.html => TDEStartupInfo.html} | 54 +++++++------- ...pInfoData.html => TDEStartupInfoData.html} | 26 +++---- ...artupInfoId.html => TDEStartupInfoId.html} | 26 +++---- doc/classref/tdecore/index.html | 6 +- examples/pytde-sampler/qt_widgets/CONTRIB | 6 +- sip/kio/krun.sip | 4 +- sip/tdecore/kaccel.sip | 2 +- sip/tdecore/kstartupinfo.sip | 70 +++++++++---------- 10 files changed, 102 insertions(+), 102 deletions(-) rename doc/classref/tdecore/{KStartupInfo.html => TDEStartupInfo.html} (88%) rename doc/classref/tdecore/{KStartupInfoData.html => TDEStartupInfoData.html} (94%) rename doc/classref/tdecore/{KStartupInfoId.html => TDEStartupInfoId.html} (87%) diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html index f784a16..6bdd84d 100644 --- a/doc/classref/allclasses.html +++ b/doc/classref/allclasses.html @@ -697,9 +697,9 @@ KSpellingHighlighter KSplashScreen KSqueezedTextLabel -KStartupInfo -KStartupInfoData -KStartupInfoId +TDEStartupInfo +TDEStartupInfoData +TDEStartupInfoId KStaticDeleterBase KStatusBar KStatusBarLabel diff --git a/doc/classref/kio/TDEProcessRunner.html b/doc/classref/kio/TDEProcessRunner.html index 08a80c0..6d8f334 100644 --- a/doc/classref/kio/TDEProcessRunner.html +++ b/doc/classref/kio/TDEProcessRunner.html @@ -48,7 +48,7 @@ - +
ArgumentTypeDefault
a0TDEProcess
binNameTQString
idKStartupInfoId
idTDEStartupInfoId
  • TDEProcessRunner () @@ -72,7 +72,7 @@ - +
    ArgumentTypeDefault
    a0TDEProcess
    binNameTQString
    idKStartupInfoId
    idTDEStartupInfoId
  • slotProcessExited (a0) diff --git a/doc/classref/tdecore/KStartupInfo.html b/doc/classref/tdecore/TDEStartupInfo.html similarity index 88% rename from doc/classref/tdecore/KStartupInfo.html rename to doc/classref/tdecore/TDEStartupInfo.html index 388b59c..2a48d70 100644 --- a/doc/classref/tdecore/KStartupInfo.html +++ b/doc/classref/tdecore/TDEStartupInfo.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KStartupInfo + class TDEStartupInfo @@ -12,7 +12,7 @@
    -

    class KStartupInfo

    +

    class TDEStartupInfo

    		 @@ -28,7 +28,7 @@ - + @@ -39,8 +39,8 @@ }
  • startup_t = {NoMatch, Match, CantDetect }

    methods

      -
    • KStartupInfo (flags, parent = 0, name = 0) -
    • tdecore
    ClassKStartupInfoTDEStartupInfo
    Inherits TQObject
    +
  • TDEStartupInfo (flags, parent = 0, name = 0) +
    • returns a KStartupInfo instance
    returns a TDEStartupInfo instance
    @@ -60,31 +60,31 @@
    ArgumentTypeDefault
    flagsbool
    parentTQObject0
  • checkStartup (w) -
    +
    returns (KStartupInfo.startup_t)
    returns (TDEStartupInfo.startup_t)
    ArgumentTypeDefault
    wWId
  • checkStartup (w, id) -
    +
    returns (KStartupInfo.startup_t)
    returns (TDEStartupInfo.startup_t)
    - +
    ArgumentTypeDefault
    wWId
    idKStartupInfoId
    idTDEStartupInfoId
  • checkStartup (w, data) -
    +
    returns (KStartupInfo.startup_t)
    returns (TDEStartupInfo.startup_t)
    - +
    ArgumentTypeDefault
    wWId
    dataKStartupInfoData
    dataTDEStartupInfoData
  • checkStartup (w, id, data) -
    +
    returns (KStartupInfo.startup_t)
    returns (TDEStartupInfo.startup_t)
    - - + +
    ArgumentTypeDefault
    wWId
    idKStartupInfoId
    dataKStartupInfoData
    idTDEStartupInfoId
    dataTDEStartupInfoData
  • createNewStartupId () @@ -93,7 +93,7 @@
    • static
  • currentStartupIdEnv () -
    +
    returns (KStartupInfoId)
    returns (TDEStartupInfoId)
    static
  • customEvent (e_P) @@ -113,22 +113,22 @@
  • gotNewStartup (id, data)
    returns nothing
    - - + +
    ArgumentTypeDefault
    idKStartupInfoId
    dataKStartupInfoData
    idTDEStartupInfoId
    dataTDEStartupInfoData
  • gotRemoveStartup (id, data)
    returns nothing
    - - + +
    ArgumentTypeDefault
    idKStartupInfoId
    dataKStartupInfoData
    idTDEStartupInfoId
    dataTDEStartupInfoData
  • gotStartupChange (id, data)
    returns nothing
    - - + +
    ArgumentTypeDefault
    idKStartupInfoId
    dataKStartupInfoData
    idTDEStartupInfoId
    dataTDEStartupInfoData
  • handleAutoAppStartedSending () @@ -144,8 +144,8 @@
    returns (bool)
    static
    - - + +
    ArgumentTypeDefault
    idKStartupInfoId
    dataKStartupInfoData
    idTDEStartupInfoId
    dataTDEStartupInfoData
  • sendChangeX (dpy, id, data) @@ -155,15 +155,15 @@
    returns (bool)
    static
    - +
    ArgumentTypeDefault
    idKStartupInfoId
    idTDEStartupInfoId
  • sendFinish (id, data)
    returns (bool)
    static
    - - + +
    ArgumentTypeDefault
    idKStartupInfoId
    dataKStartupInfoData
    idTDEStartupInfoId
    dataTDEStartupInfoData
  • sendFinishX (dpy, id) @@ -176,8 +176,8 @@
    returns (bool)
    static
    - - + +
    ArgumentTypeDefault
    idKStartupInfoId
    dataKStartupInfoData
    idTDEStartupInfoId
    dataTDEStartupInfoData
  • sendStartupX (dpy, id, data) diff --git a/doc/classref/tdecore/KStartupInfoData.html b/doc/classref/tdecore/TDEStartupInfoData.html similarity index 94% rename from doc/classref/tdecore/KStartupInfoData.html rename to doc/classref/tdecore/TDEStartupInfoData.html index 92def14..b6241f4 100644 --- a/doc/classref/tdecore/KStartupInfoData.html +++ b/doc/classref/tdecore/TDEStartupInfoData.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KStartupInfoData + class TDEStartupInfoData @@ -12,7 +12,7 @@
    -

    class KStartupInfoData

    +

    class TDEStartupInfoData

    		 @@ -28,7 +28,7 @@ - + @@ -38,17 +38,17 @@
  • TriState = {Yes, No, Unknown }

    methods

      -
    • KStartupInfoData () -
    • tdecore
    ClassKStartupInfoDataTDEStartupInfoData
    Inherits
    +
  • TDEStartupInfoData () +
    • returns a KStartupInfoData instance
    returns a TDEStartupInfoData instance
    -
  • KStartupInfoData (data) -
    +
  • TDEStartupInfoData (data) +
    • returns a KStartupInfoData instance
    returns a TDEStartupInfoData instance
    - +
    ArgumentTypeDefault
    dataKStartupInfoData
    dataTDEStartupInfoData
    -
  • KStartupInfoData (txt) -
    +
  • TDEStartupInfoData (txt) +
    • returns a KStartupInfoData instance
    returns a TDEStartupInfoData instance
    ArgumentTypeDefault
    txtTQString
    @@ -159,7 +159,7 @@
    returns nothing
    In versions KDE 3.1.1 and above only
    - +
    ArgumentTypeDefault
    stateKStartupInfoData.TriState
    stateTDEStartupInfoData.TriState
  • setTimestamp (time) @@ -176,7 +176,7 @@
  • silent () -
    +
    returns (KStartupInfoData.TriState)
    returns (TDEStartupInfoData.TriState)
    In versions KDE 3.1.1 and above only
  • timestamp () @@ -186,7 +186,7 @@
  • update (data)
    returns nothing
    - +
    ArgumentTypeDefault
    dataKStartupInfoData
    dataTDEStartupInfoData
    • diff --git a/doc/classref/tdecore/KStartupInfoId.html b/doc/classref/tdecore/TDEStartupInfoId.html similarity index 87% rename from doc/classref/tdecore/KStartupInfoId.html rename to doc/classref/tdecore/TDEStartupInfoId.html index 3671f13..22f7f36 100644 --- a/doc/classref/tdecore/KStartupInfoId.html +++ b/doc/classref/tdecore/TDEStartupInfoId.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/html4/loose.dtd""> - class KStartupInfoId + class TDEStartupInfoId @@ -12,7 +12,7 @@
    -

    class KStartupInfoId

    +

    class TDEStartupInfoId

    		 @@ -28,24 +28,24 @@ - +
    tdecore
    ClassKStartupInfoIdTDEStartupInfoId
    Inherits

    methods

      -
    • KStartupInfoId () -
      +
    • TDEStartupInfoId () +
      • returns a KStartupInfoId instance
      returns a TDEStartupInfoId instance
      -
    • KStartupInfoId (data) -
      +
    • TDEStartupInfoId (data) +
      • returns a KStartupInfoId instance
      returns a TDEStartupInfoId instance
      - +
      ArgumentTypeDefault
      dataKStartupInfoId
      dataTDEStartupInfoId
      -
    • KStartupInfoId (txt) -
      +
    • TDEStartupInfoId (txt) +
      • returns a KStartupInfoId instance
      - - - + + + diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB index eb6c2fe..6502a65 100644 --- a/examples/pytde-sampler/qt_widgets/CONTRIB +++ b/examples/pytde-sampler/qt_widgets/CONTRIB @@ -97,9 +97,9 @@ tdecore,KShortcutList,,, tdecore,KSimpleConfig,,, tdecore,TDESocket,,, tdecore,TDEStandardDirs,,, -tdecore,KStartupInfo,,, -tdecore,KStartupInfoData,,, -tdecore,KStartupInfoId,,, +tdecore,TDEStartupInfo,,, +tdecore,TDEStartupInfoData,,, +tdecore,TDEStartupInfoId,,, tdecore,KStaticDeleterBase,,, tdecore,KStdAccel,,, tdecore,KStringHandler,,, 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 @@ -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 @@ -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 @@ -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 //converts a Python list of long
      returns a TDEStartupInfoId instance
      ArgumentTypeDefault
      txtTQString
      @@ -75,21 +75,21 @@
      returns (bool)
      In versions KDE 3.1.4 and above only
      - +
      ArgumentTypeDefault
      a0KStartupInfoId
      a0TDEStartupInfoId
    • operator < (a0)
      returns (bool)
      In versions KDE 3.1.4 and above only
      - +
      ArgumentTypeDefault
      a0KStartupInfoId
      a0TDEStartupInfoId
    • operator == (a0)
      returns (bool)
      In versions KDE 3.1.4 and above only
      - +
      ArgumentTypeDefault
      a0KStartupInfoId
      a0TDEStartupInfoId
      • diff --git a/doc/classref/tdecore/index.html b/doc/classref/tdecore/index.html index b7d94b5..ac43534 100644 --- a/doc/classref/tdecore/index.html +++ b/doc/classref/tdecore/index.html @@ -144,9 +144,9 @@
      KShortcut
      KShortcutList
      KSimpleConfig
      KStartupInfo
      KStartupInfoData
      KStartupInfoId
      TDEStartupInfo
      TDEStartupInfoData
      TDEStartupInfoId
      KStaticDeleterBase
      KStdAccel
      KStdAccel.ShortcutList