From 51c1ef690e8d1ab196d501d756f37803b0ff89cf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 4 Dec 2011 01:34:05 -0600 Subject: [PATCH] Fix FTBFS --- configure.py | 2 +- doc/classref/dcop/DCOPClient.html | 8 ++++---- doc/classref/dcop/DCOPObject.html | 8 ++++---- doc/classref/kio/KDirNotify.html | 4 ++-- doc/classref/kio/KIO.Scheduler.html | 2 +- doc/classref/kio/KSycoca.html | 4 ++-- doc/classref/kio/Observer.html | 4 ++-- doc/classref/tdecore/KCmdLineArgs.html | 2 +- doc/classref/tdeui/KMainWindowInterface.html | 8 ++++---- sip/dcop/dcopclient.sip | 10 +++++----- sip/dcop/dcopobject.sip | 8 ++++---- sip/kio/kdirnotify.sip | 4 ++-- sip/kio/ksycoca.sip | 4 ++-- sip/kio/observer.sip | 4 ++-- sip/kio/scheduler.sip | 2 +- sip/tdecore/bytearray.sip | 2 +- sip/tdecore/kcmdlineargs.sip | 2 +- sip/tdeui/kmainwindowiface.sip | 8 ++++---- 18 files changed, 43 insertions(+), 43 deletions(-) diff --git a/configure.py b/configure.py index 503e3df..5ba7efa 100644 --- a/configure.py +++ b/configure.py @@ -628,7 +628,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e argv.append (pyqtcfg.pyqt_sip_dir) pyqtInclPathSeen = 1 - elif mod == "dcop" or string.find (mod, "k") == 0: + elif mod == "dcop" or string.find (mod, "k") == 0 or string.find (mod, "tde") == 0: subdir = os.path.join(srcPath("sip"), mod) argv.append("-I") argv.append(subdir) diff --git a/doc/classref/dcop/DCOPClient.html b/doc/classref/dcop/DCOPClient.html index f38547f..c6b191e 100644 --- a/doc/classref/dcop/DCOPClient.html +++ b/doc/classref/dcop/DCOPClient.html @@ -343,24 +343,24 @@
  • registeredApplications () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • remoteFunctions (remApp, remObj) -
    +
    returns (TQCStringList) ok (bool)
    returns (QCStringList) ok (bool)
    ArgumentTypeDefault
    remAppTQCString
    remObjTQCString
  • remoteInterfaces (remApp, remObj) -
    +
    returns (TQCStringList) ok (bool)
    returns (QCStringList) ok (bool)
    ArgumentTypeDefault
    remAppTQCString
    remObjTQCString
  • remoteObjects (remApp) -
    +
    returns (TQCStringList) ok (bool)
    returns (QCStringList) ok (bool)
    ArgumentTypeDefault
    remAppTQCString
    diff --git a/doc/classref/dcop/DCOPObject.html b/doc/classref/dcop/DCOPObject.html index 8626ada..2fc0dfd 100644 --- a/doc/classref/dcop/DCOPObject.html +++ b/doc/classref/dcop/DCOPObject.html @@ -88,10 +88,10 @@
  • functions () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • functionsDynamic () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • hasObject (objId)
    @@ -101,10 +101,10 @@
    returns (bool)
  • interfaces () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • interfacesDynamic () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • match (partialId)
    diff --git a/doc/classref/kio/KDirNotify.html b/doc/classref/kio/KDirNotify.html index 27adb32..8c3d58c 100644 --- a/doc/classref/kio/KDirNotify.html +++ b/doc/classref/kio/KDirNotify.html @@ -67,11 +67,11 @@
    returns (TQPtrList)
    returns a KDirNotify instance
  • functions () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • interfaces () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • process (fun, data, replyType, replyData) diff --git a/doc/classref/kio/KIO.Scheduler.html b/doc/classref/kio/KIO.Scheduler.html index 3ba66d4..3e0f53c 100644 --- a/doc/classref/kio/KIO.Scheduler.html +++ b/doc/classref/kio/KIO.Scheduler.html @@ -121,7 +121,7 @@
  • functions () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • getConnectedSlave (url, config)
    diff --git a/doc/classref/kio/KSycoca.html b/doc/classref/kio/KSycoca.html index a7810bb..3fb5806 100644 --- a/doc/classref/kio/KSycoca.html +++ b/doc/classref/kio/KSycoca.html @@ -96,11 +96,11 @@
    returns (KIO.Slave)
    static
  • functions () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • interfaces () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • isBuilding () diff --git a/doc/classref/kio/Observer.html b/doc/classref/kio/Observer.html index 143f718..534aa13 100644 --- a/doc/classref/kio/Observer.html +++ b/doc/classref/kio/Observer.html @@ -39,11 +39,11 @@
    returns a Observer instance
  • functions () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • interfaces () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • jobFinished (progressId) diff --git a/doc/classref/tdecore/KCmdLineArgs.html b/doc/classref/tdecore/KCmdLineArgs.html index c92214e..8cb2bbf 100644 --- a/doc/classref/tdecore/KCmdLineArgs.html +++ b/doc/classref/tdecore/KCmdLineArgs.html @@ -92,7 +92,7 @@ NULL (or None) parameters to mark the end of the list are not retquired
  • getOptionList (option) -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
    diff --git a/doc/classref/tdeui/KMainWindowInterface.html b/doc/classref/tdeui/KMainWindowInterface.html index e5a782c..c8ec5e0 100644 --- a/doc/classref/tdeui/KMainWindowInterface.html +++ b/doc/classref/tdeui/KMainWindowInterface.html @@ -63,7 +63,7 @@
    ArgumentTypeDefault
    optionchar
  • actions () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • activateAction (action)
    @@ -84,11 +84,11 @@
    returns (bool)
  • functions () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • functionsDynamic () -
    +
    returns (TQCStringList)
    returns (QCStringList)
  • getWinID ()
    @@ -100,7 +100,7 @@
    returns (int)
    returns nothing
  • interfaces () -
    +
    returns (TQCStringList)
    returns (QCStringList)
    In versions KDE 3.1.4 and above only
  • lower () diff --git a/sip/dcop/dcopclient.sip b/sip/dcop/dcopclient.sip index ca498f6..6ac2eb5 100644 --- a/sip/dcop/dcopclient.sip +++ b/sip/dcop/dcopclient.sip @@ -90,10 +90,10 @@ public: void endTransaction (DCOPClientTransaction*, TQCString&, TQByteArray&); Q_INT32 transactionId (); bool isApplicationRegistered (const TQCString&); - TQCStringList registeredApplications (); - TQCStringList remoteObjects (const TQCString&, bool* = 0); - TQCStringList remoteInterfaces (const TQCString&, const TQCString&, bool* = 0); - TQCStringList remoteFunctions (const TQCString&, const TQCString&, bool* = 0); + QCStringList registeredApplications (); + QCStringList remoteObjects (const TQCString&, bool* = 0); + QCStringList remoteInterfaces (const TQCString&, const TQCString&, bool* = 0); + QCStringList remoteFunctions (const TQCString&, const TQCString&, bool* = 0); bool receive (const TQCString&, const TQCString&, const TQCString&, const TQByteArray&, TQCString& /Out/, TQByteArray& /Out/); bool find (const TQCString&, const TQCString&, const TQCString&, const TQByteArray&, TQCString& /Out/, TQByteArray& /Out/); static TQCString normalizeFunctionSignature (const TQCString&); @@ -172,4 +172,4 @@ public: }; // class DCOPClient -typedef TQValueList TQCStringList; +typedef TQValueList QCStringList; diff --git a/sip/dcop/dcopobject.sip b/sip/dcop/dcopobject.sip index f3c445b..ffc53c0 100644 --- a/sip/dcop/dcopobject.sip +++ b/sip/dcop/dcopobject.sip @@ -39,10 +39,10 @@ public: bool setObjId (const TQCString&); virtual bool process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); virtual bool processDynamic (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); - virtual TQCStringList functionsDynamic (); - virtual TQCStringList interfacesDynamic (); - virtual TQCStringList interfaces (); - virtual TQCStringList functions (); + virtual QCStringList functionsDynamic (); + virtual QCStringList interfacesDynamic (); + virtual QCStringList interfaces (); + virtual QCStringList functions (); void emitDCOPSignal (const TQCString&, const TQByteArray&); bool connectDCOPSignal (const TQCString&, const TQCString&, const TQCString&, const TQCString&, bool); bool disconnectDCOPSignal (const TQCString&, const TQCString&, const TQCString&, const TQCString&); diff --git a/sip/kio/kdirnotify.sip b/sip/kio/kdirnotify.sip index 2fc96d0..e9b9fbd 100644 --- a/sip/kio/kdirnotify.sip +++ b/sip/kio/kdirnotify.sip @@ -35,8 +35,8 @@ public: %If ( KDE_3_1_4 - ) virtual bool process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); - TQCStringList functions (); - TQCStringList interfaces (); + QCStringList functions (); + QCStringList interfaces (); %End diff --git a/sip/kio/ksycoca.sip b/sip/kio/ksycoca.sip index 528a723..615002f 100644 --- a/sip/kio/ksycoca.sip +++ b/sip/kio/ksycoca.sip @@ -35,8 +35,8 @@ public: %If ( KDE_3_1_4 - ) virtual bool process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); - TQCStringList functions (); - TQCStringList interfaces (); + QCStringList functions (); + QCStringList interfaces (); %End diff --git a/sip/kio/observer.sip b/sip/kio/observer.sip index 748304a..47fe218 100644 --- a/sip/kio/observer.sip +++ b/sip/kio/observer.sip @@ -35,8 +35,8 @@ public: %If ( KDE_3_1_4 - ) virtual bool process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); - TQCStringList functions (); - TQCStringList interfaces (); + QCStringList functions (); + QCStringList interfaces (); %End diff --git a/sip/kio/scheduler.sip b/sip/kio/scheduler.sip index e0995bc..1ec06f0 100644 --- a/sip/kio/scheduler.sip +++ b/sip/kio/scheduler.sip @@ -66,7 +66,7 @@ public: static void checkSlaveOnHold (bool); void debug_info (); virtual bool process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); - virtual TQCStringList functions (); + virtual QCStringList functions (); public slots: void slotSlaveDied (KIO::Slave*); diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip index 20cd872..67367d6 100644 --- a/sip/tdecore/bytearray.sip +++ b/sip/tdecore/bytearray.sip @@ -413,7 +413,7 @@ void dcop_next (TQDataStream&, TQCString&); *a0 >> res; return sipConvertFromType(&res, sipFindType(*a1), NULL); } - else if (*a1 == "TQValueList" || *a1 == "TQCStringList") + else if (*a1 == "TQValueList" || *a1 == "QCStringList") { TQValueList res; *a0 >> res; diff --git a/sip/tdecore/kcmdlineargs.sip b/sip/tdecore/kcmdlineargs.sip index afb4cef..e9e6a43 100644 --- a/sip/tdecore/kcmdlineargs.sip +++ b/sip/tdecore/kcmdlineargs.sip @@ -226,7 +226,7 @@ errorExit: TQCString getOption (const char*); %If ( KDE_3_1_4 - ) - TQCStringList getOptionList (const char*) const; + QCStringList getOptionList (const char*) const; %End bool isSet (const char*); diff --git a/sip/tdeui/kmainwindowiface.sip b/sip/tdeui/kmainwindowiface.sip index 9260e51..f0fd1a8 100644 --- a/sip/tdeui/kmainwindowiface.sip +++ b/sip/tdeui/kmainwindowiface.sip @@ -35,18 +35,18 @@ public: %If ( KDE_3_1_4 - ) virtual bool process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); - TQCStringList functions (); - TQCStringList interfaces (); + QCStringList functions (); + QCStringList interfaces (); %End public: KMainWindowInterface (KMainWindow*); - TQCStringList functionsDynamic (); + QCStringList functionsDynamic (); bool processDynamic (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); public: - TQCStringList actions (); + QCStringList actions (); bool activateAction (TQCString); bool disableAction (TQCString); bool enableAction (TQCString);