Rename KCmd to avoid conflicts with KDE4

51 files changed, 103 insertions, 103 deletions

diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h
index 3d2c20058..0ba4fcbc6 100644
--- a/akregator/src/akregator_options.h
+++ b/akregator/src/akregator_options.h
@@ -30,14 +30,14 @@
 
 namespace Akregator {
 
-static KCmdLineOptions akregator_options[] =
+static TDECmdLineOptions akregator_options[] =
 {
 	{ "a", 0, 0 },
 	{ "addfeed <url>", I18N_NOOP( "Add a feed with the given URL" ), 0},
 	{ "g", 0, 0 },
 	{ "group <groupname>", I18N_NOOP( "When adding feeds, place them in this group" ), I18N_NOOP("Imported") },
     { "hide-mainwindow", I18N_NOOP( "Hide main window on startup" ), 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 }
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 154facbc8..4a02ff0f2 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -9,10 +9,10 @@
 
 using namespace RSS;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "+url", I18N_NOOP("URL of feed"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp
index e05345330..76db02903 100644
--- a/certmanager/kwatchgnupg/main.cpp
+++ b/certmanager/kwatchgnupg/main.cpp
@@ -79,8 +79,8 @@ int main( int argc, char** argv )
   AboutData aboutData;
 
   TDECmdLineArgs::init(argc, argv, &aboutData);
-  static const KCmdLineOptions options[] = {
-	KCmdLineLastOption// End of options.
+  static const TDECmdLineOptions options[] = {
+	TDECmdLineLastOption// End of options.
   };
   TDECmdLineArgs::addCmdLineOptions( options );
   KWatchGnuPGApplication::addCmdLineOptions();
diff --git a/certmanager/main.cpp b/certmanager/main.cpp
index f962e4ec3..011543f58 100644
--- a/certmanager/main.cpp
+++ b/certmanager/main.cpp
@@ -51,11 +51,11 @@ int main( int argc, char** argv )
   AboutData aboutData;
 
   TDECmdLineArgs::init(argc, argv, &aboutData);
-  static const KCmdLineOptions options[] = {
+  static const TDECmdLineOptions options[] = {
             { "external" , I18N_NOOP("Search for external certificates initially"), 0 },
             { "query " , I18N_NOOP("Initial query string"), 0 },
 	    { "import-certificate ", I18N_NOOP("Name of certificate file to import"), 0 },
-	    KCmdLineLastOption// End of options.
+	    TDECmdLineLastOption// End of options.
   };
   TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index f9f41f8ae..b44a01430 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -30,14 +30,14 @@ static const char appName[] = "kabc2mutt";
 static const char programName[] = I18N_NOOP( "kabc2mutt" );
 static const char description[] = I18N_NOOP( "kabc - mutt converter" );
 
-static KCmdLineOptions k2moptions[] =
+static TDECmdLineOptions k2moptions[] =
 {
   { "query <substring>", I18N_NOOP( "Only show contacts where name or address matches <substring>" ), 0 },
   { "format <format>", I18N_NOOP( "Default format is 'alias'. 'query' returns email<tab>name<tab>, as needed by mutt's query_command" ), "alias" },
   { "alternate-key-format", I18N_NOOP( "Default key format is 'JohDoe', this option turns it into 'jdoe'" ), 0 },
   { "ignore-case", I18N_NOOP( "Make queries case insensitive" ), 0 },
   { "all-addresses", I18N_NOOP( "Return all mail addresses, not just the preferred one" ), 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index 99d7080da..4a15e1782 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -30,10 +30,10 @@
 #include <kabc/stdaddressbook.h>
 #include <libtdepim/distributionlist.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "disable-autostart", "Disable automatic startup on login", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 void convertDistributionLists()
diff --git a/kaddressbook/kaddressbook_options.h b/kaddressbook/kaddressbook_options.h
index 7b12532c3..e0c189fb8 100644
--- a/kaddressbook/kaddressbook_options.h
+++ b/kaddressbook/kaddressbook_options.h
@@ -27,7 +27,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-static KCmdLineOptions kaddressbook_options[] =
+static TDECmdLineOptions kaddressbook_options[] =
 {
   { "a", 0 , 0 },
   { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 },
@@ -36,7 +36,7 @@ static KCmdLineOptions kaddressbook_options[] =
   { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 },
   { "document <file>", I18N_NOOP( "Work on given file" ), 0 },
   { "+[URL]", I18N_NOOP( "Import the given vCard" ), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 #endif /* KADDRESSBOOK_OPTIONS_H */
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index f030dd1aa..8e2c4b499 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/kalarm/kalarmd/admain.cpp
@@ -31,10 +31,10 @@
 
 #include "adapp.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
 	{ "autostart", "", 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 int main(int argc, char** argv)
diff --git a/kalarm/main.cpp b/kalarm/main.cpp
index 12a6332c7..b4474917f 100644
--- a/kalarm/main.cpp
+++ b/kalarm/main.cpp
@@ -31,7 +31,7 @@
 
 #define PROGRAM_NAME "kalarm"
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ "a", 0, 0 },
 	{ "ack-confirm", I18N_NOOP("Prompt for confirmation when alarm is acknowledged"), 0 },
@@ -101,7 +101,7 @@ static KCmdLineOptions options[] =
 	{ "volume <percent>", I18N_NOOP("Volume to play audio file"), 0 },
 #endif
 	{ "+[message]", I18N_NOOP("Message text to display"), 0 },
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index 288a6687f..06683a70c 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -44,13 +44,13 @@ static const char description[] =
 
 static const char version[] = "0.5.1";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
    { "terminal", I18N_NOOP("Show terminal window"), 0 },
    { "mobilegui", I18N_NOOP("Show mobile GUI"), 0 },
    { "nogui", I18N_NOOP("Do not show GUI"), 0 },
    { "+[profile]", I18N_NOOP("Filename of command profile file"), 0 },
-   KCmdLineLastOption // End of options.
+   TDECmdLineLastOption // End of options.
 };
 
 void initModem(Modem *modem)
diff --git a/karm/main.cpp b/karm/main.cpp
index fd81d5a7e..28ea4354f 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -19,10 +19,10 @@ namespace
   }
 }
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "+file", I18N_NOOP( "The iCalendar file to open" ), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char *argv[] )
diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp
index 322326346..0c4726a67 100644
--- a/kitchensync/src/main.cpp
+++ b/kitchensync/src/main.cpp
@@ -27,9 +27,9 @@
 #include "mainwidget.h"
 #include "mainwindow.h"
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h
index 39ce3da25..62c1c311a 100644
--- a/kmail/kmail_options.h
+++ b/kmail/kmail_options.h
@@ -5,7 +5,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-KCmdLineOptions kmail_options[] =
+TDECmdLineOptions kmail_options[] =
 {
   { "s", 0 , 0 },
   { "subject <subject>",	I18N_NOOP("Set subject of message"), 0 },
@@ -25,7 +25,7 @@ KCmdLineOptions kmail_options[] =
                                           "attach the file the 'URL' points "
                                           "to"), 0 },
 //  { "+[file]",                  I18N_NOOP("Show message from 'file'"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 #endif
diff --git a/kmailcvt/main.cpp b/kmailcvt/main.cpp
index c18dff153..b5d19a86a 100644
--- a/kmailcvt/main.cpp
+++ b/kmailcvt/main.cpp
@@ -21,9 +21,9 @@
 
 #include "kmailcvt.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char *argv[])
diff --git a/kmobile/main.cpp b/kmobile/main.cpp
index 1318352be..107803d2d 100644
--- a/kmobile/main.cpp
+++ b/kmobile/main.cpp
@@ -29,10 +29,10 @@ static const char description[] =
 
 static const char version[] = "0.1";
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "minimized", I18N_NOOP( "Minimize on startup to system tray" ), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
diff --git a/knode/knode_options.h b/knode/knode_options.h
index 03c51d4d0..2614669a0 100644
--- a/knode/knode_options.h
+++ b/knode/knode_options.h
@@ -20,10 +20,10 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-static KCmdLineOptions knode_options[] =
+static TDECmdLineOptions knode_options[] =
 {
   { "+[url]", I18N_NOOP("A 'news://server/group' URL"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 #endif /* KNODE_OPTIONS_H */
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index bf3fbb5ef..bfab6aa81 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -46,7 +46,7 @@
 
 #include <iostream>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "c", 0, 0 },
   { "create-class", I18N_NOOP("Create class"), 0 },
@@ -70,7 +70,7 @@ static const KCmdLineOptions options[] =
   { "singleton", I18N_NOOP("Create a singleton class"), 0 },
   { "protocol", I18N_NOOP("tdeioslave protocol"), 0 },
   { "+[filename]", I18N_NOOP("Source code file name"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 void addPropertyFunctions( TQString &out, const TQString &type,
@@ -403,10 +403,10 @@ int create( TDECmdLineArgs *args )
     file.addInclude( "kcmdlineargs" );
 
     KODE::Code code;
-    code += "static const KCmdLineOptions options[] =";
+    code += "static const TDECmdLineOptions options[] =";
     code += "{";
     code += "  { \"verbose\", \"Verbose output\", 0 },";
-    code += "  KCmdLineLastOption";
+    code += "  TDECmdLineLastOption";
     code += "};";
     file.addFileCode( code );
 
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index ab8bdcd68..3075fe8ff 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -29,10 +29,10 @@
 
 #include "loader.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "+wsdl", I18N_NOOP( "Location of WSDL file" ), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index 0a6a1beba..b4c7fb98f 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -31,14 +31,14 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "d", 0, 0 },
   { "directory <dir>", I18N_NOOP( "Directory to generate files in" ), "." },
   { "n", 0, 0 },
   { "namespace <namespace>", I18N_NOOP( "Namespace of the created classes" ), "." },
   { "+wsdl", I18N_NOOP( "WSDL file" ), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index 4f3fe3ed6..e8a379f29 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -44,7 +44,7 @@
 
 #include <iostream>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "d", 0, 0 },
   { "directory <dir>", I18N_NOOP("Directory to generate files in"), "." },
@@ -52,7 +52,7 @@ static const KCmdLineOptions options[] =
   { "external-parser", I18N_NOOP("Generate parser in separate source file"),
     0 },
   { "custom-parser", I18N_NOOP("Generate parser customized for schema"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 2904215f9..1cd4148de 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -80,7 +80,7 @@ static const char progDesc[] = "A command line interface to KDE calendars";
 static const char progURL[] = "pim.kde.org/components/konsolekalendar.php";
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "verbose",
     I18N_NOOP( "Print helpful runtime messages" ), 0 },
@@ -162,7 +162,7 @@ static KCmdLineOptions options[] =
     I18N_NOOP( "For more information visit the program home page at:\n"
                "  http://pim.kde.org/components/konsolekalendar.php" ), 0 },
 
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char *argv[] )
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 1cddbf1aa..c465d7244 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -183,14 +183,14 @@ void UniqueAppWatcher::unregisteredFromDCOP( const TQCString& appId )
   }
 }
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "module <module>",   I18N_NOOP( "Start with a specific Kontact module" ), 0 },
     { "iconify",   I18N_NOOP( "Start in iconified (minimized) mode" ), 0 },
     { "list", I18N_NOOP( "List all possible modules and exit" ), 0 },
     { "listprofiles", I18N_NOOP( "List all possible profiles and exit" ), 0 },
     { "profile <profile>", I18N_NOOP( "Start with a specific Kontact profile" ), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 void Kontact::UniqueAppHandler::loadKontactCommandLineOptions()
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index 0db40fed1..b4c6a69c7 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -54,7 +54,7 @@ class MyApp : public KUniqueApplication
 
 static const char korgacVersion[] = "0.9";
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { 0, 0, 0 }
 };
diff --git a/korganizer/korganizer_options.h b/korganizer/korganizer_options.h
index 52511ac9c..b29366165 100644
--- a/korganizer/korganizer_options.h
+++ b/korganizer/korganizer_options.h
@@ -29,7 +29,7 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 
-static const KCmdLineOptions korganizer_options[] =
+static const TDECmdLineOptions korganizer_options[] =
 {
   { "i", 0, 0 },
   { "import", I18N_NOOP("Import the given calendars as new resources into the default calendar"), 0 },
@@ -38,7 +38,7 @@ static const KCmdLineOptions korganizer_options[] =
   { "o", 0, 0 },
   { "open", I18N_NOOP("Open the given calendars in a new window"), 0 },
   { "+[calendars]", I18N_NOOP("Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user will be asked whether to import, merge or open in a separate window."), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 #endif /* KORGANIZER_OPTIONS_H */
diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp
index 24e2a6025..9c690863d 100644
--- a/ktnef/gui/main.cpp
+++ b/ktnef/gui/main.cpp
@@ -26,10 +26,10 @@ static const char description[] =
 	I18N_NOOP("Viewer for mail attachments using TNEF format");
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+[file]", I18N_NOOP("An optional argument 'file'"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
   // INSERT YOUR COMMANDLINE OPTIONS HERE
 };
 
diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp
index 2467e83d0..dd03ed556 100644
--- a/libkcal/convertqtopia.cpp
+++ b/libkcal/convertqtopia.cpp
@@ -36,7 +36,7 @@
 
 using namespace KCal;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"q", 0, 0 },
   {"qtopia2icalendar", I18N_NOOP("Convert TQtopia calendar file to iCalendar"), 0 },
@@ -45,7 +45,7 @@ static const KCmdLineOptions options[] =
   {"o", 0, 0},
   {"output <file>", I18N_NOOP("Output file"), 0 },
   {"+input", I18N_NOOP("Input file"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index b2cd5b9c4..626f5a52a 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -36,12 +36,12 @@ extern "C" {
 
 using namespace KCal;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "verbose", "Verbose output", 0 },
   { "+input", "Name of input file", 0 },
   { "+output", "Name of output file", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index d2be3b714..7e3770a3a 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -29,10 +29,10 @@
 
 using namespace KCal;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index c08af78e1..eeadbaae5 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -31,10 +31,10 @@
 
 using namespace KCal;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp
index b6502ec8f..a4f101133 100644
--- a/libkcal/tests/testincidence.cpp
+++ b/libkcal/tests/testincidence.cpp
@@ -31,10 +31,10 @@
 
 using namespace KCal;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp
index 8ad8f169b..e65803b12 100644
--- a/libkcal/tests/testrecurprevious.cpp
+++ b/libkcal/tests/testrecurprevious.cpp
@@ -38,12 +38,12 @@ extern "C" {
 using namespace KCal;
 
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "verbose", "Verbose output", 0 },
   { "+input", "Name of input file", 0 },
   { "[+output]", "optional name of output file for the recurrence dates", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp
index cbcec6697..8102c0991 100644
--- a/libkcal/tests/testrecurrence.cpp
+++ b/libkcal/tests/testrecurrence.cpp
@@ -38,12 +38,12 @@ extern "C" {
 using namespace KCal;
 
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "verbose", "Verbose output", 0 },
   { "+input", "Name of input file", 0 },
   { "[+output]", "optional name of output file for the recurrence dates", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp
index cbcec6697..8102c0991 100644
--- a/libkcal/tests/testrecurrencetype.cpp
+++ b/libkcal/tests/testrecurrencetype.cpp
@@ -38,12 +38,12 @@ extern "C" {
 using namespace KCal;
 
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "verbose", "Verbose output", 0 },
   { "+input", "Name of input file", 0 },
   { "[+output]", "optional name of output file for the recurrence dates", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp
index 37694ae7b..09b65aa64 100644
--- a/libkcal/tests/testrecurson.cpp
+++ b/libkcal/tests/testrecurson.cpp
@@ -38,12 +38,12 @@ extern "C" {
 using namespace KCal;
 
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "verbose", "Verbose output", 0 },
   { "+input", "Name of input file", 0 },
   { "[+output]", "optional name of output file for the recurrence dates", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index 31f8d9b10..54b536831 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -45,11 +45,11 @@
 #include "icalformat.h"
 #include "event.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "resource <type>", "The resource to test", 0 },
   { "configfile <file>", "Location of a config file for the resource", 0 },
-  KCmdLineLastOption // End of options
+  TDECmdLineLastOption // End of options
 };
 
 int main(int argc, char *argv[])
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index 810a0a6cc..304569c06 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -40,12 +40,12 @@ extern "C" {
 
 using namespace KCal;
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "verbose", "Verbose output", 0 },
   { "+input", "Name of input file", 0 },
   { "+output", "Name of output file", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index e132ac883..39ac630e5 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -31,10 +31,10 @@
 #include <fcntl.h>
 
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 int main( int argc, char** argv )
 {
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 9858a0920..6cb51f8f6 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -75,10 +75,10 @@ class TestConfigWizard : public TDEConfigWizard
     TQCheckBox *mBreakKMailCheckBox;
 };
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/tderesources/featureplan/benchmarkfeaturelist.cpp b/tderesources/featureplan/benchmarkfeaturelist.cpp
index f9f88c5cc..14225d74c 100644
--- a/tderesources/featureplan/benchmarkfeaturelist.cpp
+++ b/tderesources/featureplan/benchmarkfeaturelist.cpp
@@ -32,10 +32,10 @@
 
 #include <iostream>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "+featurelist", "Name of featurelist XML file", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 void displayFeature( Feature *f )
diff --git a/tderesources/featureplan/dumpfeaturelist.cpp b/tderesources/featureplan/dumpfeaturelist.cpp
index a007b70dc..e599f7107 100644
--- a/tderesources/featureplan/dumpfeaturelist.cpp
+++ b/tderesources/featureplan/dumpfeaturelist.cpp
@@ -32,10 +32,10 @@
 
 #include <iostream>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "+featurelist", "Name of featurelist XML file", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 void displayFeature( Feature *f )
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index e68da9ee1..2e55f1674 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -30,7 +30,7 @@ class ResourceMemory : public ResourceCached
 
 }
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "s", 0, 0 },
   { "server <hostname>", I18N_NOOP("Server"), 0 },
@@ -41,7 +41,7 @@ static const KCmdLineOptions options[] =
   { "f", 0, 0 },
   { "freebusy-user <string>", I18N_NOOP("Free/Busy user name"), 0 },
   { "addressbook-id <string>", I18N_NOOP("Addressbook identifier"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/tderesources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp
index 6b9192a33..f9e891a50 100644
--- a/tderesources/scalix/scalixadmin/main.cpp
+++ b/tderesources/scalix/scalixadmin/main.cpp
@@ -27,9 +27,9 @@
 
 static const char description[] = I18N_NOOP("Configuration Tool for Scalix Groupware Konnector");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index f8b3ff3d1..515da3ee8 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -38,12 +38,12 @@ extern "C" {
   KDE_EXPORT int kdemain( int argc, char **argv );
 }
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "+protocol", I18N_NOOP( "Protocol name" ), 0 },
   { "+pool", I18N_NOOP( "Socket name" ), 0 },
   { "+app", I18N_NOOP( "Socket name" ), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int kdemain( int argc, char **argv )
diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp
index e173134c5..ba1077304 100644
--- a/tderesources/slox/testsloxaccounts.cpp
+++ b/tderesources/slox/testsloxaccounts.cpp
@@ -27,10 +27,10 @@
 
 #include <tqpushbutton.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp
index 59a16d036..2abc46aea 100644
--- a/wizards/egroupwaremain.cpp
+++ b/wizards/egroupwaremain.cpp
@@ -26,10 +26,10 @@
 #include <kcmdlineargs.h>
 #include <kglobal.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp
index 3f10b8710..4e5222939 100644
--- a/wizards/exchangemain.cpp
+++ b/wizards/exchangemain.cpp
@@ -27,10 +27,10 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp
index 407551b68..3d7a9bda2 100644
--- a/wizards/groupwisemain.cpp
+++ b/wizards/groupwisemain.cpp
@@ -27,10 +27,10 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp
index f094b64f6..1fa3f3faa 100644
--- a/wizards/kolabmain.cpp
+++ b/wizards/kolabmain.cpp
@@ -28,10 +28,10 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/wizards/main.cpp b/wizards/main.cpp
index 3c45aae49..0a7da75b3 100644
--- a/wizards/main.cpp
+++ b/wizards/main.cpp
@@ -6,10 +6,10 @@
 
 #include "groupwarewizard.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "serverType <type>", "The server type", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp
index feca97f60..ae59311c4 100644
--- a/wizards/scalixmain.cpp
+++ b/wizards/scalixmain.cpp
@@ -28,10 +28,10 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)
diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp
index f9ec84bf0..0f2853c0a 100644
--- a/wizards/sloxmain.cpp
+++ b/wizards/sloxmain.cpp
@@ -27,10 +27,10 @@
 #include <kglobal.h>
 #include <klocale.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"verbose", "Verbose output", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc,char **argv)