14 files changed, 28 insertions, 28 deletions
diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index 21f50cbcd..854aeffc5 100644
--- a/tdeio/misc/tdefile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -194,7 +194,7 @@ TQStringList FileProps::createKeyValueList( const KFileMetaInfoGroup& g,
 
 // tdefile --mimetype --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...]
 // "key" may be a list of keys, separated by commas
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "m", 0, 0 }, // short option for --mimetype
     { "nomimetype", I18N_NOOP("Do not print the mimetype of the given file(s)"), 0 },
@@ -253,7 +253,7 @@ static KCmdLineOptions options[] =
 
     { "+[files]",
       I18N_NOOP("The file (or a number of files) to operate on."), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 
diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp
index d1d6bb939..c59067610 100644
--- a/tdeio/misc/tdemailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -20,10 +20,10 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
     { "+url", 0, 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index 7df3a344a..9b44a18b2 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -18,10 +18,10 @@
 
 #include "smtp.h"
 
-static KCmdLineOptions options[] = {
+static TDECmdLineOptions options[] = {
     { "subject <argument>", I18N_NOOP("Subject line"), 0 },
     { "recipient <argument>", I18N_NOOP("Recipient"), "submit@bugs.kde.org" },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 void BugMailer::slotError(int errornum) {
diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index a814b8e52..d3788e5d2 100644
--- a/tdeio/misc/tdetelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -29,10 +29,10 @@
 #include <kprocess.h>
 #include <ksimpleconfig.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
 	{"+url", 0, 0},
-	KCmdLineLastOption
+	TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp
index 3ae7b592b..0276008a4 100644
--- a/tdeio/tdeioexec/main.cpp
+++ b/tdeio/tdeioexec/main.cpp
@@ -49,13 +49,13 @@
 static const char description[] =
         I18N_NOOP("KIO Exec - Opens remote files, watches modifications, asks for upload");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
    { "tempfiles", I18N_NOOP("Treat URLs as local files and delete them afterwards"), 0 },
    { "suggestedfilename <file name>", I18N_NOOP("Suggested file name for the downloaded file"), 0 },
    { "+command", I18N_NOOP("Command to execute"), 0 },
    { "+[URLs]", I18N_NOOP("URL(s) or local file(s) used for 'command'"), 0 },
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 
diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp
index c741b20f0..0ca853f1a 100644
--- a/tdeio/tests/kdirwatchtest.cpp
+++ b/tdeio/tests/kdirwatchtest.cpp
@@ -16,10 +16,10 @@
 
 #include "kdirwatchtest.h"
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   {"+[directory ...]", "Directory(ies) to watch", 0},
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
diff --git a/tdeio/tests/kionetrctest.cpp b/tdeio/tests/kionetrctest.cpp
index 2d96c8495..4c05f77e1 100644
--- a/tdeio/tests/kionetrctest.cpp
+++ b/tdeio/tests/kionetrctest.cpp
@@ -38,10 +38,10 @@ int main(int argc, char **argv)
 {
     const char *version = "0.5";
     const char *description = "Unit test for .netrc and kionetrc parser.";
-    KCmdLineOptions options[] =
+    TDECmdLineOptions options[] =
     {
         { "+command", "[url1,url2 ,...]", 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
     TDECmdLineArgs::init( argc, argv, "kionetrctest", description, version );
diff --git a/tdeio/tests/kmimefromext.cpp b/tdeio/tests/kmimefromext.cpp
index 026d4173b..9b3f9dd54 100644
--- a/tdeio/tests/kmimefromext.cpp
+++ b/tdeio/tests/kmimefromext.cpp
@@ -23,10 +23,10 @@
 
 #include <stdio.h>
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+filename", "the filename to test", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char *argv[])
diff --git a/tdeio/tests/kpropsdlgtest.cpp b/tdeio/tests/kpropsdlgtest.cpp
index 811f03923..c09ff622c 100644
--- a/tdeio/tests/kpropsdlgtest.cpp
+++ b/tdeio/tests/kpropsdlgtest.cpp
@@ -5,10 +5,10 @@
 #include <kcmdlineargs.h>
 
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+url", "the path or url to the file/dir for which to show properties", 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main ( int argc, char** argv )
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index 414b5ebf1..67f27645d 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -145,10 +145,10 @@ static const char programName[] = I18N_NOOP("kurifiltertest");
 static const char description[] = I18N_NOOP("Unit test for the URI filter plugin framework.");
 static const char version[] = "1.5";
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
    { "s", I18N_NOOP("Use space as keyword delimeter for web shortcuts"), 0},
-   KCmdLineLastOption
+   TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
diff --git a/tdeio/tests/metatest.cpp b/tdeio/tests/metatest.cpp
index ee1d38201..9890bb711 100644
--- a/tdeio/tests/metatest.cpp
+++ b/tdeio/tests/metatest.cpp
@@ -9,7 +9,7 @@
 
 #define I18N_NOOP
 
- static KCmdLineOptions options[] = 
+ static TDECmdLineOptions options[] = 
   {
      { "+file", "File name", 0 },
      { "addgroup ", "Add a group to a file", 0},
@@ -23,7 +23,7 @@
      { "set ", "Set the value of --item in --group", 0},
      { "groups",  "list the groups of this file", 0 },
      { "mimetypeinfo ", "the mimetype info for a mimetype", 0 },
-     KCmdLineLastOption
+     TDECmdLineLastOption
   };
   
 void printKeyValues(KFileMetaInfo& info)
diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp
index 978845669..8256fa04f 100644
--- a/tdeio/tests/speed.cpp
+++ b/tdeio/tests/speed.cpp
@@ -57,10 +57,10 @@ void SpeedTest::finished(Job*) {
     kapp->quit();
 }
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+[URL]", "the URL to list", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main(int argc, char **argv) {
diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp
index 26534b840..aee514f54 100644
--- a/tdeio/tests/tdeioslavetest.cpp
+++ b/tdeio/tests/tdeioslavetest.cpp
@@ -480,7 +480,7 @@ void KioslaveTest::stopJob() {
 
 static const char version[] = "v0.0.0 0000";   // :-)
 static const char description[] = "Test for tdeioslaves";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
  { "s", 0, 0 },
  { "src <src>", "Source URL", "" },
@@ -490,7 +490,7 @@ static KCmdLineOptions options[] =
  { "operation <operation>", "Operation (list,listrecursive,stat,get,put,copy,move,del,shred,mkdir)", "copy" },
  { "p", 0, 0 },
  { "progress <progress>", "Progress Type (none,default,status)", "default" },
- KCmdLineLastOption
+ TDECmdLineLastOption
 };
 
 int main(int argc, char **argv) {
diff --git a/tdeio/tests/tdetradertest.cpp b/tdeio/tests/tdetradertest.cpp
index 9ce82c49f..7a4b258dc 100644
--- a/tdeio/tests/tdetradertest.cpp
+++ b/tdeio/tests/tdetradertest.cpp
@@ -22,13 +22,13 @@
 #include <kapplication.h>
 #include <stdio.h>
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
   { "+query", "the query", 0 },
   { "+[genericServiceType]", "Application (default), or KParts/ReadOnlyPart", 0 },
   { "+[constraint]", "constraint", 0 },
   { "+[preference]", "preference", 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 int main( int argc, char **argv )