From 1a8e4954899e6abb0ed0953f3442922ec364dd0b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:24 -0600 Subject: [PATCH] Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- bibletime/bibletime.cpp | 2 +- bibletime/main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp index ab3c259..c71512f 100644 --- a/bibletime/bibletime.cpp +++ b/bibletime/bibletime.cpp @@ -287,7 +287,7 @@ void BibleTime::setPlainCaption( const TQString& ) { /** Processes the commandline options given to BibleTime. */ void BibleTime::processCommandline() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // if (CBTConfig::get(CBTConfig::crashedLastTime)) { if (!CBTConfig::get diff --git a/bibletime/main.cpp b/bibletime/main.cpp index 1ec572a..d150916 100644 --- a/bibletime/main.cpp +++ b/bibletime/main.cpp @@ -231,14 +231,14 @@ int main(int argc, char* argv[]) { TQString dummy = I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"); //translator's name dummy = I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"); //translators eMail - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); BibleTimeApp app; KGlobal::dirs()->addResourceType("BT_pic", "share/apps/bibletime/pics"); KGlobal::dirs()->addResourceType("BT_DisplayTemplates", "share/apps/bibletime/display-templates"); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // A binary option (on / off) if (args->isSet("debug")) {