diff options
| author | Timothy Pearson <[email protected]> | 2013-01-21 18:37:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-21 18:37:56 -0600 |
| commit | 3d1fa8562bf693237a1a76918b4487cca3e2e356 (patch) | |
| tree | b7433e34f990eaeae6905eafdd1e801111084bc0 /sip/tdecore | |
| parent | 75a3ef0afbe95220d12b8ab4e63cfd3751abd353 (diff) | |
| download | pytde-3d1fa8562bf693237a1a76918b4487cca3e2e356.tar.gz pytde-3d1fa8562bf693237a1a76918b4487cca3e2e356.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'sip/tdecore')
| -rw-r--r-- | sip/tdecore/kapplication.sip | 4 | ||||
| -rw-r--r-- | sip/tdecore/kcmdlineargs.sip | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sip/tdecore/kapplication.sip b/sip/tdecore/kapplication.sip index 95b3212..5306a5e 100644 --- a/sip/tdecore/kapplication.sip +++ b/sip/tdecore/kapplication.sip @@ -70,10 +70,10 @@ public: // The following two lines simulate the actual ctor call // which is commented out below - KCmdLineArgs::init (nargc, argv, (char *)"unknown", (char *)"KDE Application", NULL, false); + TDECmdLineArgs::init (nargc, argv, (char *)"unknown", (char *)"KDE Application", NULL, false); sipCpp = new sipTDEApplication((bool)a1,(bool)a2); - // This method calls KCmdLineArgs::initIgnore, which is a private method + // This method calls TDECmdLineArgs::initIgnore, which is a private method // sipCpp = new sipTDEApplication (nargc,argv, qc, a1, a2); Py_END_ALLOW_THREADS diff --git a/sip/tdecore/kcmdlineargs.sip b/sip/tdecore/kcmdlineargs.sip index 04e1ad0..7a29bc1 100644 --- a/sip/tdecore/kcmdlineargs.sip +++ b/sip/tdecore/kcmdlineargs.sip @@ -46,7 +46,7 @@ public: }; // class KCmdLineOptions -class KCmdLineArgs +class TDECmdLineArgs { %TypeHeaderCode #include <kcmdlineargs.h> @@ -73,7 +73,7 @@ public: nargc = argc; Py_BEGIN_ALLOW_THREADS - KCmdLineArgs::init (nargc,argv, a1, a2, a3, a4, a5); + TDECmdLineArgs::init (nargc,argv, a1, a2, a3, a4, a5); Py_END_ALLOW_THREADS // Now modify the original list. @@ -99,7 +99,7 @@ public: nargc = argc; Py_BEGIN_ALLOW_THREADS - KCmdLineArgs::init (nargc,argv, a1, a2, a3, a4); + TDECmdLineArgs::init (nargc,argv, a1, a2, a3, a4); Py_END_ALLOW_THREADS // Now modify the original list. @@ -123,7 +123,7 @@ public: nargc = argc; Py_BEGIN_ALLOW_THREADS - KCmdLineArgs::init (nargc, argv, a1, a2); + TDECmdLineArgs::init (nargc, argv, a1, a2); Py_END_ALLOW_THREADS // Now modify the original list. @@ -206,7 +206,7 @@ public: opts [n].def = NULL; Py_BEGIN_ALLOW_THREADS - KCmdLineArgs::addCmdLineOptions (opts, a1, a2, a3); + TDECmdLineArgs::addCmdLineOptions (opts, a1, a2, a3); Py_END_ALLOW_THREADS Py_INCREF (Py_None); @@ -217,7 +217,7 @@ errorExit: return NULL; %End - static KCmdLineArgs* parsedArgs (const char* = 0); + static TDECmdLineArgs* parsedArgs (const char* = 0); static TQString cwd (); static const char* appName (); static void usage (const char* = 0); @@ -250,8 +250,8 @@ errorExit: protected: - KCmdLineArgs (const KCmdLineOptions*, const char*, const char*); - ~KCmdLineArgs (); + TDECmdLineArgs (const KCmdLineOptions*, const char*, const char*); + ~TDECmdLineArgs (); public: @@ -260,5 +260,5 @@ public: %End -}; // class KCmdLineArgs +}; // class TDECmdLineArgs |