Browse Source

Rename KApplication to TDEApplication to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 8 years ago
parent
commit
5283780d89
4 changed files with 17 additions and 17 deletions
  1. +13
    -13
      acinclude.m4
  2. +1
    -1
      src/kmplayerapp.cpp
  3. +2
    -2
      src/kmplayerconfig.cpp
  4. +1
    -1
      src/main.cpp

+ 13
- 13
acinclude.m4 View File

@ -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");


+ 1
- 1
src/kmplayerapp.cpp View File

@ -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


+ 2
- 2
src/kmplayerconfig.cpp View File

@ -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"


+ 1
- 1
src/main.cpp View File

@ -54,7 +54,7 @@ extern "C" {
KMPlayer::StringPool::init();
KApplication app;
TDEApplication app;
TQGuardedPtr <KMPlayerApp> kmplayer;
if (app.isRestored ()) {


Loading…
Cancel
Save