summaryrefslogtreecommitdiffstats
path: root/konsole
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 /konsole
parentc16d0f2191af1e4810391dbd1a06d7713fb38666 (diff)
downloadtdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz
tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'konsole')
-rw-r--r--konsole/konsole/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp
index 0a43d1c06..d82942ee7 100644
--- a/konsole/konsole/main.cpp
+++ b/konsole/konsole/main.cpp
@@ -228,11 +228,11 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
"The above list only reflects the contributors\n"
"I managed to keep track of."));
- KCmdLineArgs::init( argc, argv, &aboutData );
- KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
+ TDECmdLineArgs::init( argc, argv, &aboutData );
+ TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
//1.53 sec
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- KCmdLineArgs *qtargs = KCmdLineArgs::parsedArgs("qt");
+ TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
+ TDECmdLineArgs *qtargs = TDECmdLineArgs::parsedArgs("qt");
has_noxft = !args->isSet("xft");
TEWidget::setAntialias( !has_noxft );
TEWidget::setStandalone( true );
@@ -281,7 +281,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
if (!args->getOption("e").isEmpty())
{
if (args->isSet("ls"))
- KCmdLineArgs::usage(i18n("You can't use BOTH -ls and -e.\n"));
+ TDECmdLineArgs::usage(i18n("You can't use BOTH -ls and -e.\n"));
shell = strdup(args->getOption("e"));
eargs.append(shell);
for(int i=0; i < args->count(); i++)
@@ -408,7 +408,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
}
else
{
- KCmdLineArgs::usage(i18n("expected --vt_sz <#columns>x<#lines> e.g. 80x40\n"));
+ TDECmdLineArgs::usage(i18n("expected --vt_sz <#columns>x<#lines> e.g. 80x40\n"));
}
}