summaryrefslogtreecommitdiffstats
path: root/kdialog
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 /kdialog
parentc16d0f2191af1e4810391dbd1a06d7713fb38666 (diff)
downloadtdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz
tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kdialog')
-rw-r--r--kdialog/kdialog.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index a46e100f5..9f7b70ebd 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -152,7 +152,7 @@ static void outputStringList(TQStringList list, bool separateOutput)
}
}
-static int directCommand(KCmdLineArgs *args)
+static int directCommand(TDECmdLineArgs *args)
{
TQString title;
bool separateOutput = FALSE;
@@ -161,7 +161,7 @@ static int directCommand(KCmdLineArgs *args)
TQString defaultEntry;
// --title text
- KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt"); // --title is a qt option
+ TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt"); // --title is a qt option
if(qtargs->isSet("title")) {
title = TQFile::decodeName(qtargs->getOption("title"));
}
@@ -669,7 +669,7 @@ static int directCommand(KCmdLineArgs *args)
return Widgets::progressBar(0, title, text, totalsteps) ? 1 : 0;
}
- KCmdLineArgs::usage();
+ TDECmdLineArgs::usage();
return -2; // NOTREACHED
}
@@ -688,12 +688,12 @@ int main(int argc, char *argv[])
aboutData.addAuthor("Richard Moore",0,"[email protected]");
aboutData.addAuthor("Dawit Alemayehu",0,"[email protected]");
- KCmdLineArgs::init(argc, argv, &aboutData);
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ TDECmdLineArgs::init(argc, argv, &aboutData);
+ TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
KApplication app;
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
// execute direct kdialog command
return directCommand(args);