From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 19 Jan 2013 18:46:43 -0600
Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

---
 khotkeys/app/app.cpp       | 2 +-
 khotkeys/update/update.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'khotkeys')

diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp
index c95043c9e..670b39b1b 100644
--- a/khotkeys/app/app.cpp
+++ b/khotkeys/app/app.cpp
@@ -144,7 +144,7 @@ int KDE_EXPORT kdemain( int argc, char** argv )
 	appname.sprintf("khotkeys-screen-%d", khotkeys_screen_number);
 
                              // no need to i18n these, no GUI
-    KCmdLineArgs::init( argc, argv, appname, I18N_NOOP( "KHotKeys" ),
+    TDECmdLineArgs::init( argc, argv, appname, I18N_NOOP( "KHotKeys" ),
         I18N_NOOP( "KHotKeys daemon" ), KHOTKEYS_VERSION );
     KUniqueApplication::addCmdLineOptions();
     if( !KHotKeysApp::start()) // already running
diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp
index 91456ed70..5387382fa 100644
--- a/khotkeys/update/update.cpp
+++ b/khotkeys/update/update.cpp
@@ -34,11 +34,11 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char* argv[] )
     {
-    KCmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
+    TDECmdLineArgs::init( argc, argv, "khotkeys_update", "KHotKeys Update",
 	"KHotKeys update utility", "1.0" );
-    KCmdLineArgs::addCmdLineOptions( options );
+    TDECmdLineArgs::addCmdLineOptions( options );
     KApplication app( false, true ); // X11 connection is necessary for KKey* stuff :-/
-    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     TQCString id = args->getOption( "id" );
     TQString file = locate( "data", "khotkeys/" + id + ".khotkeys" );
     if( file.isEmpty())
-- 
cgit v1.2.1