diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 23:54:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 23:54:51 -0600 |
| commit | 5a1027eab813add3952e740eadc23f0eff24ecf6 (patch) | |
| tree | 36e59b634f612287678dfd236c16a90872f42eb8 | |
| parent | 555676e04c1c378de30f2a1113f7b90b4af5bce0 (diff) | |
| download | kdpkg-5a1027eab813add3952e740eadc23f0eff24ecf6.tar.gz kdpkg-5a1027eab813add3952e740eadc23f0eff24ecf6.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | kdpkg-install/main.cpp | 2 | ||||
| -rw-r--r-- | kdpkg/main.cpp | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 468849e..0941ddc 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/kdpkg-install/main.cpp b/kdpkg-install/main.cpp index c1c6bdc..77e5f8d 100644 --- a/kdpkg-install/main.cpp +++ b/kdpkg-install/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; install *mainWin = 0; if (!app.isRestored()) diff --git a/kdpkg/main.cpp b/kdpkg/main.cpp index d79f6a7..f1eb7f8 100644 --- a/kdpkg/main.cpp +++ b/kdpkg/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; kdpkg *mainWin = 0; if (!app.isRestored()) |