From b3f48c5f7f807147c4d0338137b9a77525aeaefb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:42:34 -0600 Subject: Rename KCmd to avoid conflicts with KDE4 --- sip/tdecore/kcmdlineargs.sip | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sip/tdecore/kcmdlineargs.sip') 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 @@ -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: -- cgit v1.2.1