summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:47 -0600
commit32b66c9ae78f439199a6d281cc33218e57c5106d (patch)
treee92cf1651596c736188317c75eeb1ce5662d57bd /kalarm
parentd29a9ff5829fa930c466b98cb93a4cbdd24b1fa2 (diff)
downloadtdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.tar.gz
tdepim-32b66c9ae78f439199a6d281cc33218e57c5106d.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/kalarmapp.cpp2
-rw-r--r--kalarm/kalarmd/adapp.cpp2
-rw-r--r--kalarm/kalarmd/admain.cpp4
-rw-r--r--kalarm/main.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 658919a63..3792a580f 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -262,7 +262,7 @@ int KAlarmApp::newInstance()
if (!firstInstance || !isRestored())
{
TQString usage;
- KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
// Use a 'do' loop which is executed only once to allow easy error exits.
// Errors use 'break' to skip to the end of the function.
diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp
index 77f31e4f0..d4613b0bd 100644
--- a/kalarm/kalarmd/adapp.cpp
+++ b/kalarm/kalarmd/adapp.cpp
@@ -60,7 +60,7 @@ int AlarmDaemonApp::newInstance()
restored = true; // make sure we restore only once
else
{
- KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
autostart = args->isSet("autostart");
args->clear(); // free up memory
}
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index c0a7792f1..282f368b4 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/kalarm/kalarmd/admain.cpp
@@ -47,8 +47,8 @@ int main(int argc, char** argv)
aboutData.addAuthor("Cornelius Schumacher", I18N_NOOP("Author"), "schumacher@kde.org");
aboutData.addAuthor("Preston Brown", I18N_NOOP("Original Author"), "pbrown@kde.org");
- KCmdLineArgs::init(argc, argv, &aboutData);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::init(argc, argv, &aboutData);
+ TDECmdLineArgs::addCmdLineOptions(options);
KUniqueApplication::addCmdLineOptions();
KStartupInfo::disableAutoAppStartedSending();
diff --git a/kalarm/main.cpp b/kalarm/main.cpp
index 8851df614..038a3ab75 100644
--- a/kalarm/main.cpp
+++ b/kalarm/main.cpp
@@ -113,8 +113,8 @@ int main(int argc, char *argv[])
"Copyright 2001-2007, David Jarvie", 0, "http://www.astrojar.org.uk/kalarm");
aboutData.addAuthor("David Jarvie", 0, "software@astrojar.org.uk");
- KCmdLineArgs::init(argc, argv, &aboutData);
- KCmdLineArgs::addCmdLineOptions(options);
+ TDECmdLineArgs::init(argc, argv, &aboutData);
+ TDECmdLineArgs::addCmdLineOptions(options);
KUniqueApplication::addCmdLineOptions();
if (!KAlarmApp::start())