summaryrefslogtreecommitdiffstats
path: root/kdesktop/main.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-19 18:46:43 -0600
committerTimothy Pearson <[email protected]>2013-01-19 18:46:43 -0600
commitd41050ea3f6904e5156d35f664346b816b9e4d12 (patch)
tree7b3ff517432a631adc61a2a93080dc3bacfab604 /kdesktop/main.cc
parentc16d0f2191af1e4810391dbd1a06d7713fb38666 (diff)
downloadtdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz
tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/main.cc')
-rw-r--r--kdesktop/main.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index a4a972065..51eb7b2a3 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -181,8 +181,8 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
aboutData.addAuthor("Torben Weis", 0, "[email protected]");
aboutData.addAuthor("Matthias Ettrich", 0, "[email protected]");
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options );
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options );
if (!KUniqueApplication::start()) {
fprintf(stderr, "kdesktop is already running!\n");
@@ -195,11 +195,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
r.send( "suspendStartup", TQCString( "kdesktop" ));
delete cl;
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
#ifdef COMPOSITE
- KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+ TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
if ( args->isSet("bg-transparency")) {
char *display = 0;