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

---
 korganizer/actionmanager.cpp       | 2 +-
 korganizer/koapp.cpp               | 2 +-
 korganizer/korgac/korgacmain.cpp   | 4 ++--
 korganizer/korgac/testalarmdlg.cpp | 2 +-
 korganizer/korgplugins.cpp         | 2 +-
 korganizer/main.cpp                | 4 ++--
 korganizer/timezone.cpp            | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'korganizer')

diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 10a791a9..52e47d57 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -2094,7 +2094,7 @@ void ActionManager::saveToProfile( const TQString & path ) const
 
 bool ActionManager::handleCommandLine()
 {
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   KOrg::MainWindow *mainWindow = ActionManager::findInstance( KURL() );
 
   bool ret = true;
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index e20c42db..eed2cd2c 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -80,7 +80,7 @@ int KOrganizerApp::newInstance()
   }
   first = false;
 
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+  TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   KOGlobals::self()->alarmClient()->startDaemon();
 
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index 6df1f0e1..95a728de 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -72,8 +72,8 @@ int main( int argc, char **argv )
   aboutData.addAuthor( "Reinhold Kainhofer", I18N_NOOP("Maintainer"),
                        "kainhofer@kde.org" );
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( options );
   KUniqueApplication::addCmdLineOptions();
 
   if ( !MyApp::start() ) exit( 0 );
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index cd3f434f..73d512d9 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -37,7 +37,7 @@
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
 
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 84e4f2ef..0763fdbb 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -35,7 +35,7 @@
 int main(int argc,char **argv)
 {
   KAboutData aboutData("korgplugins",I18N_NOOP("KOrgPlugins"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
   
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 99182438..3f335775 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -39,8 +39,8 @@ int main ( int argc, char **argv )
 {
   KOrg::AboutData aboutData;
 
-  KCmdLineArgs::init( argc, argv, &aboutData );
-  KCmdLineArgs::addCmdLineOptions( korganizer_options );
+  TDECmdLineArgs::init( argc, argv, &aboutData );
+  TDECmdLineArgs::addCmdLineOptions( korganizer_options );
   KUniqueApplication::addCmdLineOptions();
 
   if ( !KOrganizerApp::start() ) return 0;
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 3b751b6a..66d0f2ae 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -37,7 +37,7 @@
 int main(int argc,char **argv)
 {
   KAboutData aboutData("timezone",I18N_NOOP("KOrganizer Timezone Test"),"0.1");
-  KCmdLineArgs::init(argc,argv,&aboutData);
+  TDECmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
 
-- 
cgit v1.2.3