summaryrefslogtreecommitdiffstats
path: root/tdecore/tde-config.cpp.cmake
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/tde-config.cpp.cmake
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/tde-config.cpp.cmake')
-rw-r--r--tdecore/tde-config.cpp.cmake18
1 files changed, 9 insertions, 9 deletions
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 9fe328509..18d2a373f 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -121,8 +121,8 @@ int main(int argc, char **argv)
TDEInstance a("tde-config");
a.setConfigReadOnly(TRUE);
- (void)KGlobal::dirs(); // trigger the creation
- (void)KGlobal::config();
+ (void)TDEGlobal::dirs(); // trigger the creation
+ (void)TDEGlobal::config();
// Get application specific arguments
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
@@ -151,7 +151,7 @@ int main(int argc, char **argv)
if (args->isSet("localprefix"))
{
- printResult(KGlobal::dirs()->localtdedir());
+ printResult(TDEGlobal::dirs()->localtdedir());
return 0;
}
@@ -163,7 +163,7 @@ int main(int argc, char **argv)
if (args->isSet("types"))
{
- TQStringList types = KGlobal::dirs()->allTypes();
+ TQStringList types = TDEGlobal::dirs()->allTypes();
types.sort();
const char *helptexts[] = {
"apps", I18N_NOOP("Applications menu (.desktop files)"),
@@ -211,7 +211,7 @@ int main(int argc, char **argv)
TQString type = args->getOption("path");
if (!type.isEmpty())
{
- printResult(KGlobal::dirs()->resourceDirs(type.latin1()).join(":"));
+ printResult(TDEGlobal::dirs()->resourceDirs(type.latin1()).join(":"));
return 0;
}
@@ -219,13 +219,13 @@ int main(int argc, char **argv)
if (!type.isEmpty())
{
if ( type == "desktop" )
- printResult(KGlobalSettings::desktopPath());
+ printResult(TDEGlobalSettings::desktopPath());
else if ( type == "autostart" )
- printResult(KGlobalSettings::autostartPath());
+ printResult(TDEGlobalSettings::autostartPath());
else if ( type == "trash" )
- printResult(KGlobalSettings::trashPath());
+ printResult(TDEGlobalSettings::trashPath());
else if ( type == "document" )
- printResult(KGlobalSettings::documentPath());
+ printResult(TDEGlobalSettings::documentPath());
else
fprintf(stderr, "%s", i18n("%1 - unknown type of userpath\n").arg(type).local8Bit().data() );
return 0;