From 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- tdecore/tde-config.cpp.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/tde-config.cpp.cmake') diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 0afbd9422..58c6407d8 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -115,9 +115,9 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow"); - KCmdLineArgs::init( argc, argv, &about); + TDECmdLineArgs::init( argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); // Add my own options. + TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options. KInstance a("tde-config"); a.setConfigReadOnly(TRUE); @@ -125,7 +125,7 @@ int main(int argc, char **argv) (void)KGlobal::config(); // Get application specific arguments - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); _expandvars = args->isSet("expandvars"); -- cgit v1.2.1 From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdecore/tde-config.cpp.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdecore/tde-config.cpp.cmake') diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 58c6407d8..9fe328509 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -114,12 +114,12 @@ void printResult(const TQString &s) int main(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); - KAboutData about("tde-config", "tde-config", "1.0", description, KAboutData::License_GPL, "(C) 2000 Stephan Kulow"); + TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow"); TDECmdLineArgs::init( argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options. - KInstance a("tde-config"); + TDEInstance a("tde-config"); a.setConfigReadOnly(TRUE); (void)KGlobal::dirs(); // trigger the creation (void)KGlobal::config(); -- cgit v1.2.1 From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdecore/tde-config.cpp.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tdecore/tde-config.cpp.cmake') 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; -- cgit v1.2.1 From 59d153016be1e09cb31cdb18bef0a649acfc6292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 08:17:52 -0600 Subject: Rename KLocale to enhance compatibility with KDE4 --- tdecore/tde-config.cpp.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdecore/tde-config.cpp.cmake') diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 18d2a373f..b633aa2d4 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -113,7 +113,7 @@ void printResult(const TQString &s) int main(int argc, char **argv) { - KLocale::setMainCatalogue("tdelibs"); + TDELocale::setMainCatalogue("tdelibs"); TDEAboutData about("tde-config", "tde-config", "1.0", description, TDEAboutData::License_GPL, "(C) 2000 Stephan Kulow"); TDECmdLineArgs::init( argc, argv, &about); @@ -176,7 +176,7 @@ int main(int argc, char **argv) "kcfg", I18N_NOOP("Configuration description files"), "lib", I18N_NOOP("Libraries"), "include", I18N_NOOP("Includes/Headers"), - "locale", I18N_NOOP("Translation files for KLocale"), + "locale", I18N_NOOP("Translation files for TDELocale"), "mime", I18N_NOOP("Mime types"), "module", I18N_NOOP("Loadable modules"), "qtplugins", I18N_NOOP("Qt plugins"), -- cgit v1.2.1 From 5466d52073af147d100482cbf633087bb9fb631b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:46:01 -0600 Subject: Rename KCmd to avoid conflicts with KDE4 --- tdecore/tde-config.cpp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdecore/tde-config.cpp.cmake') diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index b633aa2d4..e235c4f8c 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -13,7 +13,7 @@ static const char *description = I18N_NOOP("A little program to output installation paths"); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "expandvars", I18N_NOOP("expand ${prefix} and ${exec_prefix} in output"), 0 }, { "prefix", I18N_NOOP("Compiled in prefix for TDE libraries"), 0 }, -- cgit v1.2.1 From 8bd62a3b0d3b362b783a273e2460811392485bbd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:17:18 -0600 Subject: Rename common header files for consistency with class renaming --- tdecore/tde-config.cpp.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/tde-config.cpp.cmake') diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index e235c4f8c..98481cefe 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -1,15 +1,15 @@ // -*- c++ -*- -#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include static const char *description = I18N_NOOP("A little program to output installation paths"); -- cgit v1.2.1 From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:57:54 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- tdecore/tde-config.cpp.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/tde-config.cpp.cmake') diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake index 98481cefe..36e752f33 100644 --- a/tdecore/tde-config.cpp.cmake +++ b/tdecore/tde-config.cpp.cmake @@ -1,11 +1,11 @@ // -*- c++ -*- #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include -- cgit v1.2.1