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

---
 korundum/rubylib/korundum/kdehandlers.cpp                      | 8 ++++----
 korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'korundum')

diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp
index 7236fc9b..83db54cf 100644
--- a/korundum/rubylib/korundum/kdehandlers.cpp
+++ b/korundum/rubylib/korundum/kdehandlers.cpp
@@ -187,7 +187,7 @@ void marshall_TQCStringList(Marshall *m) {
 #  define BREAKPOINT { fprintf(stderr, "hit ctrl-c\n"); int b = 0; while (b == 0) { ; } }
 #endif
 
-void marshall_KCmdLineOptions(Marshall *m) {
+void marshall_TDECmdLineOptions(Marshall *m) {
 	switch(m->action()) {
 	case Marshall::FromVALUE: 
 		{
@@ -201,8 +201,8 @@ void marshall_KCmdLineOptions(Marshall *m) {
 			}
 
 			// Allocate 'length + 1' entries, to include an all NULLs last entry
-			KCmdLineOptions *cmdLineOptions = (KCmdLineOptions *) calloc(	RARRAY_LEN(optionslist) + 1, 
-																			sizeof(struct KCmdLineOptions) );
+			TDECmdLineOptions *cmdLineOptions = (TDECmdLineOptions *) calloc(	RARRAY_LEN(optionslist) + 1, 
+																			sizeof(struct TDECmdLineOptions) );
 			
 			VALUE options;
 			long i;
@@ -1388,7 +1388,7 @@ void marshall_TQMapTQCStringDCOPRef(Marshall *m) {
 
 TypeHandler KDE_handlers[] = {
     { "QCStringList", marshall_TQCStringList },
-    { "KCmdLineOptions*", marshall_KCmdLineOptions },
+    { "TDECmdLineOptions*", marshall_TDECmdLineOptions },
     { "TDEActionPtrList", marshall_TDEActionList },
     { "TQPtrList<TDEAction>", marshall_TDEActionList },
     { "TQPtrList<TDEAction>&", marshall_TDEActionList },
diff --git a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
index 8db55019..ef923e71 100644
--- a/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
+++ b/korundum/rubylib/rbtdeconfig_compiler/rbtdeconfig_compiler.cpp
@@ -39,13 +39,13 @@
 
 #include <iostream>
 
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
 {
   { "d", 0, 0 },
   { "directory <dir>", I18N_NOOP("Directory to generate files in"), "." },
   { "+file.kcfg", I18N_NOOP("Input kcfg XML file"), 0 },
   { "+file.kcfgc", I18N_NOOP("Code generation options file"), 0 },
-  KCmdLineLastOption
+  TDECmdLineLastOption
 };
 
 
-- 
cgit v1.2.3