diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 23:54:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 23:54:32 -0600 |
| commit | e945e139888a8e0545e9dd991d162bc5c26855ab (patch) | |
| tree | 8abc22d6d1694cb3501f8457eddf8939c6f2291b | |
| parent | 0be18c99128cee9610f4d4c8151abab7d08dc4c4 (diff) | |
| download | kchmviewer-e945e139888a8e0545e9dd991d162bc5c26855ab.tar.gz kchmviewer-e945e139888a8e0545e9dd991d162bc5c26855ab.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
3 files changed, 15 insertions, 15 deletions
@@ -254,7 +254,7 @@ - It is possible to use QTextBrowser even for a KDE application. 2005-04-27 tim <[email protected]> - - KDE integration started. Now we support KApplication, KMainWindow and KFileDialog. + - KDE integration started. Now we support TDEApplication, KMainWindow and KFileDialog. 2005-04-24 tim <[email protected]> - version 0.2 released. diff --git a/acinclude.m4 b/acinclude.m4 index 7c5e3fc..095df10 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 201d4e4..1ab0584 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -62,7 +62,7 @@ int main( int argc, char ** argv ) TDECmdLineArgs::init (argc, argv, &aboutdata); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; #else TQApplication app( argc, argv ); #endif |