Rename KCmd to avoid conflicts with KDE4

6 files changed, 11 insertions, 11 deletions

diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 4e5166c2e..b69803f21 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -11,10 +11,10 @@
 static const char description[] =
         I18N_NOOP("Installs a KWM theme");
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[file]", I18N_NOOP("Path to a theme config file"), 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 void copy(const TQString &src, const TQString &dest)
diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp
index 188c22f77..23806b3ba 100644
--- a/twin/kcmtwin/twinrules/main.cpp
+++ b/twin/kcmtwin/twinrules/main.cpp
@@ -264,12 +264,12 @@ static int edit( Window wid, bool whole_app )
     
 } // namespace
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
     {
     // no need for I18N_NOOP(), this is not supposed to be used directly
         { "wid <wid>", "WId of the window for special window settings.", 0 },
         { "whole-app", "Whether the settings should affect all windows of the application.", 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
 extern "C"
diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp
index 0904653a2..75b80c9e5 100644
--- a/twin/killer/killer.cpp
+++ b/twin/killer/killer.cpp
@@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE.
 #include <twin.h>
 #include <X11/Xlib.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
     {
     // no need for I18N_NOOP(), this is not supposed to be used directly
         { "pid <pid>", "PID of the application to terminate.", 0 },
@@ -40,7 +40,7 @@ static const KCmdLineOptions options[] =
         { "applicationname <name>", "Name of the application to be terminated.", 0 },
         { "wid <id>", "ID of resource belonging to the application.", 0 },
         { "timestamp <time>", "Time of user action causing killing.", 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
 int main( int argc, char* argv[] )
diff --git a/twin/main.cpp b/twin/main.cpp
index b21540db0..4ee1346e2 100644
--- a/twin/main.cpp
+++ b/twin/main.cpp
@@ -230,11 +230,11 @@ static void sighandler(int)
 static const char version[] = "3.0";
 static const char description[] = I18N_NOOP( "TDE window manager" );
 
-static KCmdLineOptions args[] =
+static TDECmdLineOptions args[] =
     {
         { "lock", I18N_NOOP("Disable configuration options"), 0 },
         { "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
 extern "C"
diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp
index b9c3a587d..7f77e25dc 100644
--- a/twin/resumer/resumer.cpp
+++ b/twin/resumer/resumer.cpp
@@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE.
 #include <twin.h>
 #include <X11/Xlib.h>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
     {
     // no need for I18N_NOOP(), this is not supposed to be used directly
         { "pid <pid>", "PID of the application to resume.", 0 },
@@ -39,7 +39,7 @@ static const KCmdLineOptions options[] =
         { "windowname <caption>", "Caption of the window to be resumed.", 0 },
         { "applicationname <name>", "Name of the application to be resumed.", 0 },
         { "wid <id>", "ID of resource belonging to the application.", 0 },
-        KCmdLineLastOption
+        TDECmdLineLastOption
     };
 
 int main( int argc, char* argv[] )
diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp
index e69ce5932..5ef1008b5 100644
--- a/twin/tools/decobenchmark/main.cpp
+++ b/twin/tools/decobenchmark/main.cpp
@@ -37,7 +37,7 @@
 #include "preview.h"
 #include "main.h"
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
 	{ "+decoration", "Decoration library to use, such as twin3_plastik.", 0 },
 	{ "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 },