summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:01:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:01:12 -0600
commit41a4fd29f0f673139efaf83d8bf8dd761a14653d (patch)
treea60d59bfa77b3f8e7d59a038260b241685f773b8
parent07d7372dd2cc7c31003af2c3033664407d6f9ab0 (diff)
downloadtdesudo-41a4fd29f0f673139efaf83d8bf8dd761a14653d.tar.gz
tdesudo-41a4fd29f0f673139efaf83d8bf8dd761a14653d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--acinclude.m426
-rw-r--r--tdesudo/main.cpp2
2 files changed, 14 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index b1d2d04..546b19a 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/tdesudo/main.cpp b/tdesudo/main.cpp
index c97dca3..c8c1b9f 100644
--- a/tdesudo/main.cpp
+++ b/tdesudo/main.cpp
@@ -73,7 +73,7 @@ int main(int argc, char **argv)
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
- KApplication a;
+ TDEApplication a;
TQString executable;
TQStringList executableList;