From 227d1ebc07e3926eeb6fca2f48c2567c836c5010 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:31 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- microbe/main.cpp | 6 +++--- src/core/main.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/microbe/main.cpp b/microbe/main.cpp index b294a0b..7e8d003 100644 --- a/microbe/main.cpp +++ b/microbe/main.cpp @@ -51,10 +51,10 @@ int main(int argc, char **argv) KAboutData::License_GPL, "(C) 2004-2005, The KTechlab developers", 0, "http://ktechlab.org", "ktechlab-devel@lists.sourceforge.net" ); about.addAuthor( "Daniel Clarke", 0, "daniel.jc@gmail.com" ); about.addAuthor( "David Saxton", 0, "david@bluehaze.org" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if(args->count() == 2 ) { diff --git a/src/core/main.cpp b/src/core/main.cpp index e8431ce..5c46d52 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -39,8 +39,8 @@ int main(int argc, char **argv) about.addCredit( "John Myers", "Rotary Switch" ); about.addCredit( "Ali Akcaagac", "Glib friendliness." ); about.addCredit( "David Leggett", "Website hosting and feedback during early development." ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; // register ourselves as a dcop client @@ -48,7 +48,7 @@ int main(int argc, char **argv) KTechlab *ktechlab = new KTechlab(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); for ( int i=0; i < args->count(); ++i ) ktechlab->load( args->url(i) );