From 5466d52073af147d100482cbf633087bb9fb631b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 6 Feb 2013 19:46:01 -0600
Subject: Rename KCmd to avoid conflicts with KDE4

---
 tdehtml/java/tests/testkjavaappletserver.cpp | 4 ++--
 tdehtml/test_regression.cpp                  | 4 ++--
 tdehtml/testtdehtml.cpp                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tdehtml')

diff --git a/tdehtml/java/tests/testkjavaappletserver.cpp b/tdehtml/java/tests/testkjavaappletserver.cpp
index ea8a7656b..d0af25127 100644
--- a/tdehtml/java/tests/testkjavaappletserver.cpp
+++ b/tdehtml/java/tests/testkjavaappletserver.cpp
@@ -9,10 +9,10 @@
 #include "java/kjavaapplet.h"
 #include "java/kjavaappletwidget.h"
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "+[tdelibs_path]", "path to tdelibs directory", 0 },
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 int main(int argc, char **argv)
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 3e1e14d8c..a127bb709 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -400,7 +400,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List
 
 // -------------------------------------------------------------------------
 
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
 {
     { "b", 0, 0 },
     { "base <base_dir>", "Directory containing tests, basedir and output directories.", 0},
@@ -419,7 +419,7 @@ static KCmdLineOptions options[] =
     { "output <directory>", "Put output in <directory> instead of <base_dir>/output", 0 } ,
     { "+[base_dir]", "Directory containing tests,basedir and output directories. Only regarded if -b is not specified.", 0 } ,
     { "+[testcases]", "Relative path to testcase, or directory of testcases to be run (equivalent to -t).", 0 } ,
-    KCmdLineLastOption
+    TDECmdLineLastOption
 };
 
 static bool existsDir(TQCString dir)
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 78ae83203..91eb19eee 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -32,7 +32,7 @@
 #include "domtreeview.h"
 #include <tdefiledialog.h>
 
-static KCmdLineOptions options[] = { { "+file", "url to open", 0 } , KCmdLineLastOption };
+static TDECmdLineOptions options[] = { { "+file", "url to open", 0 } , TDECmdLineLastOption };
 
 int main(int argc, char *argv[])
 {
-- 
cgit v1.2.1