Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 11e65e2290
commit 1a8e495489

@ -287,7 +287,7 @@ void BibleTime::setPlainCaption( const TQString& ) {
/** Processes the commandline options given to BibleTime. */ /** Processes the commandline options given to BibleTime. */
void BibleTime::processCommandline() { void BibleTime::processCommandline() {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
// if (CBTConfig::get(CBTConfig::crashedLastTime)) { // if (CBTConfig::get(CBTConfig::crashedLastTime)) {
if (!CBTConfig::get if (!CBTConfig::get

@ -231,14 +231,14 @@ int main(int argc, char* argv[]) {
TQString dummy = I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"); //translator's name TQString dummy = I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"); //translator's name
dummy = I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"); //translators eMail dummy = I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"); //translators eMail
KCmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
BibleTimeApp app; BibleTimeApp app;
KGlobal::dirs()->addResourceType("BT_pic", "share/apps/bibletime/pics"); KGlobal::dirs()->addResourceType("BT_pic", "share/apps/bibletime/pics");
KGlobal::dirs()->addResourceType("BT_DisplayTemplates", "share/apps/bibletime/display-templates"); KGlobal::dirs()->addResourceType("BT_DisplayTemplates", "share/apps/bibletime/display-templates");
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
// A binary option (on / off) // A binary option (on / off)
if (args->isSet("debug")) { if (args->isSet("debug")) {

Loading…
Cancel
Save