summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:42:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:42:34 -0600
commitb3f48c5f7f807147c4d0338137b9a77525aeaefb (patch)
treee5451a754812b9d70b728394c84e84aefed1c00a
parentd152eb8cb5d1428596acf9dcb21c7aeb3bc56ec9 (diff)
downloadpytde-b3f48c5f7f807147c4d0338137b9a77525aeaefb.tar.gz
pytde-b3f48c5f7f807147c4d0338137b9a77525aeaefb.zip
Rename KCmd to avoid conflicts with KDE4
-rw-r--r--doc/classref/allclasses.html2
-rw-r--r--doc/classref/tdecore/TDECmdLineArgs.html4
-rw-r--r--doc/classref/tdecore/TDECmdLineOptions.html (renamed from doc/classref/tdecore/KCmdLineOptions.html)6
-rw-r--r--doc/classref/tdecore/index.html2
-rw-r--r--examples/pytde-sampler/qt_widgets/CONTRIB2
-rw-r--r--sip/tdecore/kcmdlineargs.sip14
6 files changed, 15 insertions, 15 deletions
diff --git a/doc/classref/allclasses.html b/doc/classref/allclasses.html
index dfa11f6..d2455b2 100644
--- a/doc/classref/allclasses.html
+++ b/doc/classref/allclasses.html
@@ -263,7 +263,7 @@
<tr ><td><a href="tdecore/KCharsets.html">KCharsets</A></td></tr>
<tr ><td><a href="tdecore/TDEClipboardSynchronizer.html">TDEClipboardSynchronizer</A></td></tr>
<tr ><td><a href="tdecore/TDECmdLineArgs.html">TDECmdLineArgs</A></td></tr>
-<tr ><td><a href="tdecore/KCmdLineOptions.html">KCmdLineOptions</A></td></tr>
+<tr ><td><a href="tdecore/TDECmdLineOptions.html">TDECmdLineOptions</A></td></tr>
<tr ><td><a href="tdecore/KCodecs.html">KCodecs</A></td></tr>
<tr ><td><a href="tdeui/KColor.html">KColor</A></td></tr>
<tr ><td><a href="tdeui/KColorCells.html">KColorCells</A></td></tr>
diff --git a/doc/classref/tdecore/TDECmdLineArgs.html b/doc/classref/tdecore/TDECmdLineArgs.html
index 9069612..e8874ba 100644
--- a/doc/classref/tdecore/TDECmdLineArgs.html
+++ b/doc/classref/tdecore/TDECmdLineArgs.html
@@ -38,7 +38,7 @@
<li><b>TDECmdLineArgs</b> (_options, _name, _id)
<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>a TDECmdLineArgs instance</i></td></tr>
</table><table><tr bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>_options</td><td>KCmdLineOptions</td><td></td></tr>
+<tr><td>_options</td><td>TDECmdLineOptions</td><td></td></tr>
<tr><td>_name</td><td>char</td><td></td></tr>
<tr><td>_id</td><td>char</td><td></td></tr>
</table>
@@ -53,7 +53,7 @@
<tr><td>afterId</td><td>char</td><td>0</td></tr>
</table>
</td><td width="50%"><table><tr><td>A Pytbon list of tuples (name, description, default) is the first parameter
-instead of a KCmdLineOptions object (KCmdLineOptions is not used);
+instead of a TDECmdLineOptions object (TDECmdLineOptions is not used);
NULL (or None) parameters to mark the end of the list are not required
</td></tr></table></td></tr></table></li><hr>
<li><b>addTempFileOption</b> ()
diff --git a/doc/classref/tdecore/KCmdLineOptions.html b/doc/classref/tdecore/TDECmdLineOptions.html
index 751bb87..54e7dce 100644
--- a/doc/classref/tdecore/KCmdLineOptions.html
+++ b/doc/classref/tdecore/TDECmdLineOptions.html
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/html4/loose.dtd"">
<html>
<head>
- <title>class KCmdLineOptions</title>
+ <title>class TDECmdLineOptions</title>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<meta name="GENERATOR" content="wabbit dumphtml">
</head>
@@ -12,7 +12,7 @@
<hr>
<table width="100%"><tr>
<td width ="70%">
- <h1>class KCmdLineOptions</h1><hr>
+ <h1>class TDECmdLineOptions</h1><hr>
</td>
<td width="30%" valign="top" align="right">
<table>
@@ -28,7 +28,7 @@
<td width="30%" align=left>tdecore</td>
</tr>
<tr><td>Class</td>
- <td>KCmdLineOptions</td>
+ <td>TDECmdLineOptions</td>
</tr>
<tr><td>Inherits</td>
<td> </td>
diff --git a/doc/classref/tdecore/index.html b/doc/classref/tdecore/index.html
index 7c9b4f4..ba7951b 100644
--- a/doc/classref/tdecore/index.html
+++ b/doc/classref/tdecore/index.html
@@ -45,7 +45,7 @@
<tr ><td><a href="KCharsets.html">KCharsets</a></td></tr>
<tr ><td><a href="TDEClipboardSynchronizer.html">TDEClipboardSynchronizer</a></td></tr>
<tr ><td><a href="TDECmdLineArgs.html">TDECmdLineArgs</a></td></tr>
-<tr ><td><a href="KCmdLineOptions.html">KCmdLineOptions</a></td></tr>
+<tr ><td><a href="TDECmdLineOptions.html">TDECmdLineOptions</a></td></tr>
<tr ><td><a href="KCodecs.html">KCodecs</a></td></tr>
<tr ><td><a href="KCompletion.html">KCompletion</a></td></tr>
<tr ><td><a href="KCompletionBase.html"><i>KCompletionBase</i></a></td></tr>
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index 8c3f7c6..8f12647 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -29,7 +29,7 @@ tdecore,KCatalogue,,,
tdecore,KCharsets,,,
tdecore,TDEClipboardSynchronizer,,,
tdecore,TDECmdLineArgs,,,
-tdecore,KCmdLineOptions,,,
+tdecore,TDECmdLineOptions,,,
tdecore,KCodecs,,,
tdecore,KCompletion,,,
tdecore,KCompletionBase,,,
diff --git a/sip/tdecore/kcmdlineargs.sip b/sip/tdecore/kcmdlineargs.sip
index f716f68..7f6226d 100644
--- a/sip/tdecore/kcmdlineargs.sip
+++ b/sip/tdecore/kcmdlineargs.sip
@@ -24,7 +24,7 @@
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KCmdLineOptions
+class TDECmdLineOptions
{
%TypeHeaderCode
#include <kcmdlineargs.h>
@@ -43,7 +43,7 @@ public:
%End
-}; // class KCmdLineOptions
+}; // class TDECmdLineOptions
class TDECmdLineArgs
@@ -132,13 +132,13 @@ public:
%End
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)];
+ static void addCmdLineOptions (SIP_PYLIST, const char* = 0, const char* = 0, const char* = 0) [void (const TDECmdLineOptions*, 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)
//doc
// A Pytbon list of tuples (name, description, default) is the first parameter
-// instead of a KCmdLineOptions object (KCmdLineOptions is not used);
+// instead of a TDECmdLineOptions object (TDECmdLineOptions is not used);
// NULL (or None) parameters to mark the end of the list are not required
//end
@@ -148,10 +148,10 @@ public:
return NULL;
// opts is persistent
- KCmdLineOptions *opts;
+ TDECmdLineOptions *opts;
Py_BEGIN_ALLOW_THREADS
- opts = new KCmdLineOptions [n + 1];
+ opts = new TDECmdLineOptions [n + 1];
Py_END_ALLOW_THREADS
int i, tsz;
@@ -250,7 +250,7 @@ errorExit:
protected:
- TDECmdLineArgs (const KCmdLineOptions*, const char*, const char*);
+ TDECmdLineArgs (const TDECmdLineOptions*, const char*, const char*);
~TDECmdLineArgs ();
public: