diff options
| author | Timothy Pearson <[email protected]> | 2013-01-20 00:04:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-20 00:04:46 -0600 |
| commit | 6a241448d9bf9fc0924407d2e1b89947431d2a1d (patch) | |
| tree | 1ad1b0b80d390efdf4e586be0a88f2f07bf52de0 | |
| parent | 58fca9ecb3628a70a8e3e2c26a53f0815895399c (diff) | |
| download | libkdcraw-6a241448d9bf9fc0924407d2e1b89947431d2a1d.tar.gz libkdcraw-6a241448d9bf9fc0924407d2e1b89947431d2a1d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | libkdcraw/libkdcraw/dcrawsettingswidget.cpp | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ea3168e..d6a7783 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2003,20 +2003,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/libkdcraw/libkdcraw/dcrawsettingswidget.cpp b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp index 118acdb..8309758 100644 --- a/libkdcraw/libkdcraw/dcrawsettingswidget.cpp +++ b/libkdcraw/libkdcraw/dcrawsettingswidget.cpp @@ -660,7 +660,7 @@ void DcrawSettingsWidget::updateMinimumWidth() void DcrawSettingsWidget::processDcrawURL(const TQString& url) { - KApplication::kApplication()->invokeBrowser(url); + TDEApplication::kApplication()->invokeBrowser(url); } KURLRequester* DcrawSettingsWidget::inputProfileUrlEdit() const |