summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:56:14 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:56:14 -0600
commitd8be0710ca0ca7d477edb068cf255df229ed73ac (patch)
tree004f457cd337f69f5a30d5bf74b1d381d3e9a94c
parent9fdfd1e304d56f6ff152b55e9c077d9c07223714 (diff)
downloadknutclient-d8be0710ca0ca7d477edb068cf255df229ed73ac.tar.gz
knutclient-d8be0710ca0ca7d477edb068cf255df229ed73ac.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--acinclude.m426
-rw-r--r--src/main.cpp2
2 files changed, 14 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 5d231dd..452203d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h>
int main() {
- printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
- printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
- printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
- printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
- printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
- printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
- printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
- printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
- printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
- printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+ printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+ printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+ printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+ printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+ printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+ printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+ printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+ printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+ printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+ printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n",
- KApplication::kde_wallpaperdir().data());
- printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
- printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+ TDEApplication::kde_wallpaperdir().data());
+ printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+ printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n");
diff --git a/src/main.cpp b/src/main.cpp
index 5f272fb..f01a285 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
// next line is for testing only.
// I don't debug KUniqueApplication
-// KApplication a;
+// TDEApplication a;
//
KNutClient *knutclient = new KNutClient(!noDock);
int returnCode = a.exec();