summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:54:48 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:54:48 -0600
commitb28c2d00e9435da6e04d13367210c4f51114a0bc (patch)
tree672c19db5f7bf03c7aff5ec30bd8c45d149fbced
parent2b8b39e544fc06d9c661a873a2afda6a9aceca3c (diff)
downloadkdirstat-b28c2d00e9435da6e04d13367210c4f51114a0bc.tar.gz
kdirstat-b28c2d00e9435da6e04d13367210c4f51114a0bc.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
-rw-r--r--acinclude.m426
-rw-r--r--kdirstat/kdirstatapp.h4
-rw-r--r--kdirstat/kdirstatmain.cpp2
3 files changed, 16 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3217def..c91210d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1932,20 +1932,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/kdirstat/kdirstatapp.h b/kdirstat/kdirstatapp.h
index 1457a6f..df9e603 100644
--- a/kdirstat/kdirstatapp.h
+++ b/kdirstat/kdirstatapp.h
@@ -60,7 +60,7 @@ using namespace KDirStat;
* session management as well as using KActions.
*
* @see KMainWindow
- * @see KApplication
+ * @see TDEApplication
* @see KConfig
*
* @author Source Framework Automatically Generated by KDevelop,
@@ -341,7 +341,7 @@ protected:
/**
* Save the window properties for each open window during session end to
* the session config file, including saving the currently opened file by a
- * temporary filename provided by KApplication.
+ * temporary filename provided by TDEApplication.
*
* @see KTMainWindow#saveProperties
**/
diff --git a/kdirstat/kdirstatmain.cpp b/kdirstat/kdirstatmain.cpp
index a75c17d..383c8de 100644
--- a/kdirstat/kdirstatmain.cpp
+++ b/kdirstat/kdirstatmain.cpp
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
- KApplication app;
+ TDEApplication app;
if ( app.isRestored() )
{