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

---
 tderesources/scalix/scalixadmin/main.cpp  | 4 ++--
 tderesources/scalix/tdeioslave/scalix.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tderesources/scalix')

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 )
-- 
cgit v1.2.1