Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

26 files changed, 75 insertions, 75 deletions

diff --git a/ChangeLog.2001-4 b/ChangeLog.2001-4
index 2d15ff3..61008b3 100644
--- a/ChangeLog.2001-4
+++ b/ChangeLog.2001-4
@@ -157,7 +157,7 @@ KAccelMenu, KToolBar, and KGlobalAccel with
 
 2002/2/11 13:50:00 jim
 3.0alpha5: versioning to KDE2.2.1; fixed bug in
-KCmdLineArgs.init1 (Henrik Motakef) Modified
+TDECmdLineArgs.init1 (Henrik Motakef) Modified
 examples/pykless.py so KAboutData is used instead
 of KMainWindow.helpMenu (3.0alpha5 was not
 released)
diff --git a/contrib/kdepyuic b/contrib/kdepyuic
index bdda64a..0b3d006 100755
--- a/contrib/kdepyuic
+++ b/contrib/kdepyuic
@@ -95,7 +95,7 @@ def checkOptions (optlist):
 
 def addimport (n):
     if addApp:
-        n.write ('from tdecore import KCmdLineArgs, TDEApplication\n')
+        n.write ('from tdecore import TDECmdLineArgs, TDEApplication\n')
     if i18nFunc:
         n.write ('from tdecore import i18n\n')
     n.write ('from tdeui import *\n\n')
@@ -106,7 +106,7 @@ def addapp (indent, n):
     n.write (indent + 'description = ""\n')
     n.write (indent + 'version     = ""\n')
     n.write ('\n')
-    n.write (indent + 'KCmdLineArgs.init (sys.argv, appname, description, version)\n')
+    n.write (indent + 'TDECmdLineArgs.init (sys.argv, appname, description, version)\n')
     n.write (indent + 'a = TDEApplication ()\n\n')
 
 def doPyuic ():
diff --git a/examples/example_dcopexport.py b/examples/example_dcopexport.py
index 1df6318..6c9efdb 100644
--- a/examples/example_dcopexport.py
+++ b/examples/example_dcopexport.py
@@ -34,7 +34,7 @@ copyright holder.
 # which was written by Torben Weis and Julian Rockey
 
 import sys
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
 from dcopexport import DCOPExObj
 from qt import TQString, TQStringList
 
@@ -109,9 +109,9 @@ aboutData   = KAboutData ("testdcopexport", "petshop",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app   = TDEApplication ()
 dcop  = app.dcopClient ()
diff --git a/examples/example_dcopext.py b/examples/example_dcopext.py
index 05a906d..e206a21 100644
--- a/examples/example_dcopext.py
+++ b/examples/example_dcopext.py
@@ -30,7 +30,7 @@ copyright holder.
 import sys, time
 import dcop
 import dcopext
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
 from qt import TQString, TQCString
 
 
@@ -61,9 +61,9 @@ aboutData   = KAboutData ("testdcopext", "testdcopext",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app  = TDEApplication ()
 dcop = app.dcopClient ()
diff --git a/examples/kurldemo.py b/examples/kurldemo.py
index 30f0bb2..0c03007 100644
--- a/examples/kurldemo.py
+++ b/examples/kurldemo.py
@@ -31,7 +31,7 @@ urls = ["http://slashdot.org", "http://www.kde.org", "http://www.riverbankcomput
 
 import sys
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, KURL
 from tdeui import KMainWindow, KEdit
 
 class MainWin (KMainWindow):
@@ -88,9 +88,9 @@ aboutData   = KAboutData ("", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/examples/menudemo.py b/examples/menudemo.py
index 9ddac1b..f6426ce 100644
--- a/examples/menudemo.py
+++ b/examples/menudemo.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
                   KActionSeparator, KActionMenu, KWindowListMenu
 
@@ -281,9 +281,9 @@ aboutData   = KAboutData ("", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/examples/mimetype.py b/examples/mimetype.py
index 61d5545..fc85699 100644
--- a/examples/mimetype.py
+++ b/examples/mimetype.py
@@ -41,7 +41,7 @@ import sys
 
 from qt import TQWidget, TQButtonGroup, TQt, TQLabel, TQListView, TQListViewItem
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, KURL
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, KURL
 from tdeui import KMainWindow, KTabCtl, KListBox
 from kio import KMimeType, KService, KServiceGroup, KServiceType, KTrader, KServiceTypeProfile, KServiceGroup
 
@@ -259,9 +259,9 @@ aboutData   = KAboutData ("", "",\
     version, description, KAboutData.License_GPL,\
     "(C) 2003 Jim Bublitz")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/examples/pyKHTMLPart.py b/examples/pyKHTMLPart.py
index 6d92c1c..bcccdc7 100644
--- a/examples/pyKHTMLPart.py
+++ b/examples/pyKHTMLPart.py
@@ -43,7 +43,7 @@ lifted from the KDE classref.
 # If you import more classes, don't forget to add them here (some of these
 # are extras/not used)
 
-from tdecore import KCmdLineArgs, KURL, TDEApplication, i18n, KAboutData, BarIcon, KLibLoader
+from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, KAboutData, BarIcon, KLibLoader
 
 from tdeui import KMainWindow, KMessageBox, KAction, KStdAction, KKeyDialog, KEditToolbar
 
@@ -193,7 +193,7 @@ aboutData = KAboutData ("pyKHTMLPart", "pyHTMLPart",\
 aboutData.addAuthor ("Jim Bublitz", "Example for PyKDE", "jbublitz@nwinternet.com")
 
 # This MUST go here (before TDEApplication () is called)
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
 app = TDEApplication ()
 
@@ -205,10 +205,10 @@ else:
         parts = pyPartsMW (None, "pyParts")
         if len(sys.argv) > 1:
         # read kcmdlineargs.h for the full unabridged instructions
-        # on using KCmdLineArgs, it's pretty confusing at first, but it works
+        # on using TDECmdLineArgs, it's pretty confusing at first, but it works
         # This is pretty useless in this program - you might want to
         # expand this in your app (to load a file, etc)
-                args = KCmdLineArgs.parsedArgs()
+                args = TDECmdLineArgs.parsedArgs()
 
 parts.show()
 app.exec_loop()
diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB
index 3e0c57f..3c741aa 100644
--- a/examples/pytde-sampler/qt_widgets/CONTRIB
+++ b/examples/pytde-sampler/qt_widgets/CONTRIB
@@ -28,7 +28,7 @@ tdecore,KCalendarSystemFactory,,,
 tdecore,KCatalogue,,,
 tdecore,KCharsets,,,
 tdecore,KClipboardSynchronizer,,,
-tdecore,KCmdLineArgs,,,
+tdecore,TDECmdLineArgs,,,
 tdecore,KCmdLineOptions,,,
 tdecore,KCodecs,,,
 tdecore,KCompletion,,,
diff --git a/examples/pytde-sampler/runner.py b/examples/pytde-sampler/runner.py
index 3f479f6..d9eee11 100755
--- a/examples/pytde-sampler/runner.py
+++ b/examples/pytde-sampler/runner.py
@@ -3,7 +3,7 @@
 
 """
 import sys
-from tdecore import TDEApplication, KCmdLineArgs
+from tdecore import TDEApplication, TDECmdLineArgs
 from tdeui import KMainWindow
 from qt import TQVBoxLayout
 
@@ -42,10 +42,10 @@ def importItem(name):
 
 if __name__ == '__main__':
     options = [('+item', 'An item in the sys.path')]
-    KCmdLineArgs.init(sys.argv, about.about)
-    KCmdLineArgs.addCmdLineOptions(options)
+    TDECmdLineArgs.init(sys.argv, about.about)
+    TDECmdLineArgs.addCmdLineOptions(options)
  
-    args = KCmdLineArgs.parsedArgs()
+    args = TDECmdLineArgs.parsedArgs()
     if not args.count():
         args.usage()
     else:
diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py
index ec1d053..4e7eb43 100755
--- a/examples/pytde-sampler/sampler.py
+++ b/examples/pytde-sampler/sampler.py
@@ -14,7 +14,7 @@ from qt import SIGNAL, SLOT, PYSIGNAL, TQt
 from qt import TQVBoxLayout, TQLabel, TQPixmap, TQSplitter, TQFrame, TQDialog
 from qt import TQSizePolicy, TQHBoxLayout, TQSpacerItem, TQPushButton
 
-from tdecore import i18n, KAboutData, TDEApplication, KCmdLineArgs, KGlobal
+from tdecore import i18n, KAboutData, TDEApplication, TDECmdLineArgs, KGlobal
 from tdecore import KGlobalSettings, KWin, KWinModule, KURL, KIcon
 
 from tdeui import KComboBox, KListView, KListViewItem, KTabWidget, KTextEdit
@@ -409,7 +409,7 @@ class SamplerMainWindow(KMainWindow):
 
 if __name__ == '__main__':
     aboutdata = about.about()    
-    KCmdLineArgs.init(sys.argv, aboutdata)
+    TDECmdLineArgs.init(sys.argv, aboutdata)
     app = TDEApplication()
 
     splashpix = TQPixmap(os.path.join(lib.samplerpath, 'aboutkde.png'))
diff --git a/examples/uikmdi.py b/examples/uikmdi.py
index 1034232..32735ce 100644
--- a/examples/uikmdi.py
+++ b/examples/uikmdi.py
@@ -29,7 +29,7 @@ import os
 import sys
 
 from qt import SIGNAL, TQVBoxLayout, TQLabel
-from tdecore import i18n, KAboutData, TDEApplication, KGlobal, KIcon, KCmdLineArgs
+from tdecore import i18n, KAboutData, TDEApplication, KGlobal, KIcon, TDECmdLineArgs
 from tdeui import KDockWidget, KListBox, KStdAction
 
 try:
@@ -196,7 +196,7 @@ if __name__ == '__main__':
     about = KAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
     about.addAuthor(author, 'hi, mom!', authormail)
     about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
-    KCmdLineArgs.init(sys.argv, about)
+    TDECmdLineArgs.init(sys.argv, about)
     app = TDEApplication()
     mainWindow = KmdiExample()
     mainWindow.show()
diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py
index 382739d..a204d7a 100644
--- a/examples/uiqxembed.py
+++ b/examples/uiqxembed.py
@@ -6,7 +6,7 @@ import sys
 
 from qt import TQIconSet, TQProcess, TQTimer, SIGNAL, SLOT
 
-from tdecore import KAboutData, TDEApplication, KCmdLineArgs, KGlobal, KIcon
+from tdecore import KAboutData, TDEApplication, TDECmdLineArgs, KGlobal, KIcon
 from tdecore import KWin, KWinModule
 from tdeui import KComboBox, KMainWindow, KPushButton, QXEmbed
 
@@ -111,7 +111,7 @@ if __name__ == '__main__':
     about = KAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail)
     about.addAuthor(author, 'hi, mom!', authormail)
     about.addAuthor ('Jim Bublitz', 'For PyKDE', 'jbublitz@nwinternet.com')
-    KCmdLineArgs.init(sys.argv, about)
+    TDECmdLineArgs.init(sys.argv, about)
     app = TDEApplication()
     mainWindow = ExampleMain()
     mainWindow.show()
diff --git a/examples/uisampler.py b/examples/uisampler.py
index 29a0f92..3a1b00c 100644
--- a/examples/uisampler.py
+++ b/examples/uisampler.py
@@ -3,7 +3,7 @@ sys.path.append ("./uimodules")
 
 from qt import TQSplitter, TQWidgetStack, TQWidget, TQListViewItem, SIGNAL, TQCString , TQScrollView, TQRect, TQt
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
 from tdeui import KMainWindow, KListView
 
 from uidialogs import *
diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py
index f05d312..bc9a9a2 100644
--- a/examples/xmlmenudemo.py
+++ b/examples/xmlmenudemo.py
@@ -43,7 +43,7 @@ import sys, os
 
 from qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KIcon, KIconLoader, KShortcut, KGlobal
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KToggleAction, KFontSizeAction, KFontAction, KRadioAction,\
                   KActionSeparator, KActionMenu, KWindowListMenu, KXMLGUIClient, KActionCollection
 
@@ -281,9 +281,9 @@ aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
 mainpath = os.path.dirname (os.path.abspath (sys.argv[0]))
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
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
 
diff --git a/templates/annotated/basicapp.py b/templates/annotated/basicapp.py
index 44b6681..b5abe80 100644
--- a/templates/annotated/basicapp.py
+++ b/templates/annotated/basicapp.py
@@ -35,7 +35,7 @@ copyright holder.
 
 import sys
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
 from tdeui import KMainWindow
 
 """
@@ -75,7 +75,7 @@ aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
 # Pass the command line arguments and aboutData to
-# KCmdLineArgs - this is where KDE will look for
+# TDECmdLineArgs - this is where KDE will look for
 # this information. The TDEApplication constructor
 # used below *requires* the args are processed
 # *before* TDEApplication is instantiated. There
@@ -85,7 +85,7 @@ aboutData.addAuthor ("author2", "they did something else", "another@email.addres
 # Note that instead of argc/argv, this constructor
 # only takes a single argument - sys.argv - which
 # is a Python list
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
 # Set up the command line options (switches) you
 # want your app to be able to process (you could
@@ -94,7 +94,7 @@ KCmdLineArgs.init (sys.argv, aboutData)
 
 # Note that the argument for this method is a list
 # of tuples
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 # instantiate TDEApplication - no other TQObject
 # or TQWidget based classes can be instantiated
diff --git a/templates/annotated/menuapp1.py b/templates/annotated/menuapp1.py
index d18ea00..faa8662 100644
--- a/templates/annotated/menuapp1.py
+++ b/templates/annotated/menuapp1.py
@@ -45,7 +45,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
 from tdeui import KMainWindow, KMessageBox
 
 TOOLBAR_NEW   = 1
@@ -136,7 +136,7 @@ class MainWin (KMainWindow):
 
         # Let KDE generate a nifty help menu
 
-        # The KAboutData/KCmdLineArgs data from the main part of the program
+        # The KAboutData/TDECmdLineArgs data from the main part of the program
         # will be used to generate the About dialog
 
         helpMenu = self.helpMenu ("")
@@ -247,7 +247,7 @@ class MainWin (KMainWindow):
 # See athe minimal.py and basicapp.py templates for
 # explantion of the basic app and main window setup
 
-# The following data is passed to KCmdLineArgs, which in
+# The following data is passed to TDECmdLineArgs, which in
 # turn makes it available to the "about" box in the Help
 # menu (when the Help menu is created as above)
 
@@ -260,9 +260,9 @@ aboutData   = KAboutData ("", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/templates/annotated/menuapp2.py b/templates/annotated/menuapp2.py
index c5cbe1b..1924eef 100644
--- a/templates/annotated/menuapp2.py
+++ b/templates/annotated/menuapp2.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction
 
 STATUSBAR_LEFT   = 1
@@ -234,9 +234,9 @@ aboutData   = KAboutData ("", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/templates/annotated/menuapp3.py b/templates/annotated/menuapp3.py
index 19140ef..84a90f7 100644
--- a/templates/annotated/menuapp3.py
+++ b/templates/annotated/menuapp3.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection
 
 STATUSBAR_LEFT   = 1
@@ -198,9 +198,9 @@ aboutData   = KAboutData ("menuapp3", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/templates/annotated/systray1.py b/templates/annotated/systray1.py
index 1537fbc..db017c3 100644
--- a/templates/annotated/systray1.py
+++ b/templates/annotated/systray1.py
@@ -74,7 +74,7 @@ class MainWin (KMainWindow):
 
 #-------------------- main ------------------------------------------------
 
-# The usual stuff - you can also use the KAboutData/KCmdLineArgs version
+# The usual stuff - you can also use the KAboutData/TDECmdLineArgs version
 # for program startup used in other templates - the TDEApplication constructor
 # used here may be obsoleted eventually
 appName = "template"
diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py
index b5b5f62..01ce1af 100644
--- a/templates/basic/basicapp.py
+++ b/templates/basic/basicapp.py
@@ -30,7 +30,7 @@ copyright holder.
 import sys
 
 from qt import SIGNAL
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData
 from tdeui import KMainWindow
 
 class MainWin (KMainWindow):
@@ -49,7 +49,7 @@ aboutData   = KAboutData ("", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py
index 4b33bda..7809cef 100644
--- a/templates/basic/menuapp1.py
+++ b/templates/basic/menuapp1.py
@@ -44,7 +44,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KStdAccel, KIcon, KIconLoader
 from tdeui import KMainWindow, KMessageBox
 
 TOOLBAR_NEW   = 1
@@ -184,9 +184,9 @@ aboutData   = KAboutData ("", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/templates/basic/menuapp2.py b/templates/basic/menuapp2.py
index 54d3593..f765692 100644
--- a/templates/basic/menuapp2.py
+++ b/templates/basic/menuapp2.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KShortcut
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction
 
 STATUSBAR_LEFT   = 1
@@ -190,9 +190,9 @@ aboutData   = KAboutData ("", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")
diff --git a/templates/basic/menuapp3.py b/templates/basic/menuapp3.py
index e3328bc..9051661 100644
--- a/templates/basic/menuapp3.py
+++ b/templates/basic/menuapp3.py
@@ -43,7 +43,7 @@ import sys
 
 from qt import TQPopupMenu, SIGNAL
 
-from tdecore import TDEApplication, KCmdLineArgs, KAboutData, i18n, KShortcut
+from tdecore import TDEApplication, TDECmdLineArgs, KAboutData, i18n, KShortcut
 from tdeui import KMainWindow, KMessageBox, KStdAction, KAction, KActionCollection
 
 STATUSBAR_LEFT   = 1
@@ -151,9 +151,9 @@ aboutData   = KAboutData ("menuapp3", "",\
 aboutData.addAuthor ("author1", "whatever they did", "email@somedomain")
 aboutData.addAuthor ("author2", "they did something else", "another@email.address")
 
-KCmdLineArgs.init (sys.argv, aboutData)
+TDECmdLineArgs.init (sys.argv, aboutData)
 
-KCmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
+TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")])
 
 app = TDEApplication ()
 mainWindow = MainWin (None, "main window")