diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:00:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:00:30 -0600 |
| commit | 717ccda876094818f2b9cce36e79e39fc8159288 (patch) | |
| tree | eff7b9dbb13e030eb642eaf2f8b5f9f015f6b0da | |
| parent | b2a451497f6a3d83e655d32d2e0f439e45a16bce (diff) | |
| download | potracegui-717ccda876094818f2b9cce36e79e39fc8159288.tar.gz potracegui-717ccda876094818f2b9cce36e79e39fc8159288.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 14 insertions, 14 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/src/main.cpp b/src/main.cpp index 169ca09..a979f5b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) about.addCredit( "Tim Fechtner", I18N_NOOP("German translation"), "Tim.Fechtner@gmx.de"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; potracegui *firstWidget = 0; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); |