summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:54:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:54:30 -0600
commita534d91c7c4920edcd4436c19055e1fcd17d48a2 (patch)
tree75762bc370d076d81cddf559313d2f07fbfe492a
parenta6edf7391e906592c9321686c046197c74dbbdf9 (diff)
downloadkbookreader-a534d91c7c4920edcd4436c19055e1fcd17d48a2.tar.gz
kbookreader-a534d91c7c4920edcd4436c19055e1fcd17d48a2.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--acinclude.m426
-rw-r--r--src/bookreader_client.cpp2
-rw-r--r--src/main.cpp2
3 files changed, 15 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index a078382..dd9f7b7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1924,20 +1924,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/bookreader_client.cpp b/src/bookreader_client.cpp
index d9cc8d7..2fd43b7 100644
--- a/src/bookreader_client.cpp
+++ b/src/bookreader_client.cpp
@@ -26,7 +26,7 @@
int main(int argc, char **argv)
{
- KApplication app(argc, argv, "bookreader_client", false);
+ TDEApplication app(argc, argv, "bookreader_client", false);
// get our DCOP client and attach so that we may use it
DCOPClient *client = app.dcopClient();
diff --git a/src/main.cpp b/src/main.cpp
index e0c0a92..1341b27 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
about.addAuthor("Alexander Nemish", 0, "atlanter@gmail.com");
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
// register ourselves as a dcop client
app.dcopClient()->registerAs(app.name(), false);