diff options
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | src/kmplayerapp.cpp | 2 | ||||
| -rw-r--r-- | src/kmplayerconfig.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3801232..365eb86 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/kmplayerapp.cpp b/src/kmplayerapp.cpp index 94b318e..9bc2c05 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -549,7 +549,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp(TQWidget* , const char* name) } #endif /** TWin are you there? **/ - m_haveKWin = KApplication::dcopClient()->isApplicationRegistered("twin"); + m_haveKWin = TDEApplication::dcopClient()->isApplicationRegistered("twin"); if (m_haveKWin) kdDebug() << "Window manager: TWin found" << endl; else diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp index 42df760..64b6bcd 100644 --- a/src/kmplayerconfig.cpp +++ b/src/kmplayerconfig.cpp @@ -369,7 +369,7 @@ KDE_NO_EXPORT bool Settings::createDialog () { this, TQT_SLOT (okPressed ())); connect (configdialog, TQT_SIGNAL (applyClicked ()), this, TQT_SLOT (okPressed ())); - if (KApplication::kApplication()) + if (TDEApplication::kApplication()) connect (configdialog, TQT_SIGNAL (helpClicked ()), this, TQT_SLOT (getHelp ())); return true; @@ -734,7 +734,7 @@ void Settings::okPressed () { } KDE_NO_EXPORT void Settings::getHelp () { - KApplication::kApplication()->invokeBrowser ("man:/mplayer"); + TDEApplication::kApplication()->invokeBrowser ("man:/mplayer"); } #include "kmplayerconfig.moc" diff --git a/src/main.cpp b/src/main.cpp index 71a3a62..7799a18 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -54,7 +54,7 @@ extern "C" { KMPlayer::StringPool::init(); - KApplication app; + TDEApplication app; TQGuardedPtr <KMPlayerApp> kmplayer; if (app.isRestored ()) { |