TDE
/
python-trinity
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Fix FTBFS

pull/1/head
Timothy Pearson 11 years ago
parent
63ddb2ddfe
commit
51c1ef690e
18 changed files with 43 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      configure.py
  2. 8
      doc/classref/dcop/DCOPClient.html
  3. 8
      doc/classref/dcop/DCOPObject.html
  4. 4
      doc/classref/kio/KDirNotify.html
  5. 2
      doc/classref/kio/KIO.Scheduler.html
  6. 4
      doc/classref/kio/KSycoca.html
  7. 4
      doc/classref/kio/Observer.html
  8. 2
      doc/classref/tdecore/KCmdLineArgs.html
  9. 8
      doc/classref/tdeui/KMainWindowInterface.html
  10. 10
      sip/dcop/dcopclient.sip
  11. 8
      sip/dcop/dcopobject.sip
  12. 4
      sip/kio/kdirnotify.sip
  13. 4
      sip/kio/ksycoca.sip
  14. 4
      sip/kio/observer.sip
  15. 2
      sip/kio/scheduler.sip
  16. 2
      sip/tdecore/bytearray.sip
  17. 2
      sip/tdecore/kcmdlineargs.sip
  18. 8
      sip/tdeui/kmainwindowiface.sip

2
configure.py
Unescape View File

@ -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)

8
doc/classref/dcop/DCOPClient.html
Unescape View File

@ -343,24 +343,24 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>registeredApplications</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>remoteFunctions</b> (remApp, remObj)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList) ok (bool)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList) ok (bool)</i></td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>remApp</td><td>TQCString</td><td></td></tr>
<tr><td>remObj</td><td>TQCString</td><td></td></tr>
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>remoteInterfaces</b> (remApp, remObj)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList) ok (bool)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList) ok (bool)</i></td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>remApp</td><td>TQCString</td><td></td></tr>
<tr><td>remObj</td><td>TQCString</td><td></td></tr>
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>remoteObjects</b> (remApp)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList) ok (bool)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList) ok (bool)</i></td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>remApp</td><td>TQCString</td><td></td></tr>
</table>

8
doc/classref/dcop/DCOPObject.html
Unescape View File

@ -88,10 +88,10 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functions</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functionsDynamic</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>hasObject</b> (objId)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
@ -101,10 +101,10 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>interfaces</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>interfacesDynamic</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>match</b> (partialId)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQPtrList<DCOPObject>)</i></td></tr>

4
doc/classref/kio/KDirNotify.html
Unescape View File

@ -67,11 +67,11 @@
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a KDirNotify instance</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functions</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>interfaces</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>process</b> (fun, data, replyType, replyData)

2
doc/classref/kio/KIO.Scheduler.html
Unescape View File

@ -121,7 +121,7 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functions</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>getConnectedSlave</b> (url, config)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(KIO.Slave)</i></td></tr>

4
doc/classref/kio/KSycoca.html
Unescape View File

@ -96,11 +96,11 @@
<tr><td><i>static</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functions</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>interfaces</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>isBuilding</b> ()

4
doc/classref/kio/Observer.html
Unescape View File

@ -39,11 +39,11 @@
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a Observer instance</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functions</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>interfaces</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>jobFinished</b> (progressId)

2
doc/classref/tdecore/KCmdLineArgs.html
Unescape View File

@ -92,7 +92,7 @@ NULL (or None) parameters to mark the end of the list are not retquired
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>getOptionList</b> (option)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
<tr><td>option</td><td>char</td><td></td></tr>

8
doc/classref/tdeui/KMainWindowInterface.html
Unescape View File

@ -63,7 +63,7 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>actions</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>activateAction</b> (action)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(bool)</i></td></tr>
@ -84,11 +84,11 @@
</table>
</td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functions</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>functionsDynamic</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>getWinID</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(int)</i></td></tr>
@ -100,7 +100,7 @@
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>interfaces</b> ()
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQCStringList)</i></td></tr>
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(QCStringList)</i></td></tr>
<tr><td>In versions KDE 3.1.4 and above only</td></tr>
</table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
<li><b>lower</b> ()

10
sip/dcop/dcopclient.sip
Unescape View File

@ -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<TQCString> TQCStringList;
typedef TQValueList<TQCString> QCStringList;

8
sip/dcop/dcopobject.sip
Unescape View File

@ -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&);

4
sip/kio/kdirnotify.sip
Unescape View File

@ -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

4
sip/kio/ksycoca.sip
Unescape View File

@ -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

4
sip/kio/observer.sip
Unescape View File

@ -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

2
sip/kio/scheduler.sip
Unescape View File

@ -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*);

2
sip/tdecore/bytearray.sip
Unescape View File

@ -413,7 +413,7 @@ void dcop_next (TQDataStream&, TQCString&);
*a0 >> res;
return sipConvertFromType(&res, sipFindType(*a1), NULL);
}
else if (*a1 == "TQValueList<DCOPRef>" || *a1 == "TQCStringList")
else if (*a1 == "TQValueList<DCOPRef>" || *a1 == "QCStringList")
{
TQValueList<DCOPRef> res;
*a0 >> res;

2
sip/tdecore/kcmdlineargs.sip
Unescape View File

@ -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*);

8
sip/tdeui/kmainwindowiface.sip
Unescape View File

@ -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);

Write Preview
Loading…
Cancel
Save