From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:43 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- khelpcenter/application.cpp | 6 +++--- khelpcenter/htmlsearch/index.cpp | 6 +++--- khelpcenter/khc_indexbuilder.cpp | 6 +++--- khelpcenter/testmetainfo.cpp | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'khelpcenter') diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index a15f77cd6..89a664d1c 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -35,7 +35,7 @@ int Application::newInstance() { if (restoringSession()) return 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL url; if ( args->count() ) @@ -74,8 +74,8 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) aboutData.addAuthor( "Wojciech Smigaj", I18N_NOOP("Info page support"), "achu@klub.chip.pl" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::addCmdLineOptions(); KHC::Application app; diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index 4b1642fa5..77bf2d62d 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -19,13 +19,13 @@ int main(int argc, char *argv[]) "", I18N_NOOP("TDE Index generator for help files.")); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KGlobal::locale()->setMainCatalogue("htmlsearch"); KApplication app; HTMLSearch search; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); search.generateIndex(args->getOption("lang")); } diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 63231fe9f..ca12b5b91 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -179,13 +179,13 @@ int main( int argc, char **argv ) aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 2 ) { kdDebug(1402) << "Wrong number of arguments." << endl; diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp index 5e0a4e208..13b0e1800 100644 --- a/khelpcenter/testmetainfo.cpp +++ b/khelpcenter/testmetainfo.cpp @@ -89,7 +89,7 @@ class AsyncTraverser : public DocEntryTraverser int main(int argc,char **argv) { KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1"); - KCmdLineArgs::init(argc,argv,&aboutData); + TDECmdLineArgs::init(argc,argv,&aboutData); KApplication app; -- cgit v1.2.3