summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 18:46:31 -0600
commit31e5489c296e957aae6e52b077f296c72db7d223 (patch)
tree548c92e2ccdb649c392e3a6bf13a39cb426616a0
parente790f3ca5cff66adfc53c3b6bdfe3b7d65db0fad (diff)
downloadkrusader-31e5489c.tar.gz
krusader-31e5489c.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r--krusader/krusader.cpp2
-rw-r--r--krusader/main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp
index e8cff4c..866992d 100644
--- a/krusader/krusader.cpp
+++ b/krusader/krusader.cpp
@@ -207,7 +207,7 @@ KAction *Krusader::actShowJSConsole = 0;
Krusader::Krusader() : KParts::MainWindow(0,0,WType_TopLevel|WDestructiveClose|TQt::WStyle_ContextHelp),
DCOPObject("Krusader-Interface"), status(NULL), sysTray( 0 ), isStarting( true ), isExiting( false ), directExit( false ) {
// parse command line arguments
- KCmdLineArgs * args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs * args = TDECmdLineArgs::parsedArgs();
kapp->ref(); // FIX: krusader exits at closing the viewer when minimized to tray
diff --git a/krusader/main.cpp b/krusader/main.cpp
index 4c4c32f..7b8482e 100644
--- a/krusader/main.cpp
+++ b/krusader/main.cpp
@@ -181,8 +181,8 @@ int main(int argc, char *argv[]) {
aboutData.addCredit("Ivan Petrouchtchak","Ukrainian translation","connyosis@gmx.net",0);
// Command line arguments ...
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
// check for command line arguments