summaryrefslogtreecommitdiffstats
path: root/kmenuedit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:43 -0600
commitd41050ea3f6904e5156d35f664346b816b9e4d12 (patch)
tree7b3ff517432a631adc61a2a93080dc3bacfab604 /kmenuedit
parentc16d0f2191af1e4810391dbd1a06d7713fb38666 (diff)
downloadtdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz
tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kmenuedit')
-rw-r--r--kmenuedit/kcontrol_main.cpp2
-rw-r--r--kmenuedit/main.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp
index 6d9322ca..3555937b 100644
--- a/kmenuedit/kcontrol_main.cpp
+++ b/kmenuedit/kcontrol_main.cpp
@@ -42,7 +42,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "sandrini@kde.org");
aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
- KCmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
KUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start())
diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp
index 8e644dd5..e2f70b62 100644
--- a/kmenuedit/main.cpp
+++ b/kmenuedit/main.cpp
@@ -48,7 +48,7 @@ public:
virtual int newInstance()
{
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if (args->count() > 0)
{
menuEdit->selectMenu(TQString::fromLocal8Bit(args->arg(0)));
@@ -71,9 +71,9 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
aboutData.addAuthor("Raffaele Sandrini", I18N_NOOP("Previous Maintainer"), "sandrini@kde.org");
aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
- KCmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
KUniqueApplication::addCmdLineOptions();
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::addCmdLineOptions( options );
if (!KUniqueApplication::start())
return 1;