diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 23:55:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 23:55:30 -0600 |
| commit | 5283780d89368dad60287f316e17916ff2ef29c1 (patch) | |
| tree | dd1c6a04b7e807ca17bf08b6a360ce3ab8903980 /src | |
| parent | 86b34a4e0e6a2442207b865b108c6873da358dd3 (diff) | |
| download | kmplayer-5283780d89368dad60287f316e17916ff2ef29c1.tar.gz kmplayer-5283780d89368dad60287f316e17916ff2ef29c1.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src')
| -rw-r--r-- | src/kmplayerapp.cpp | 2 | ||||
| -rw-r--r-- | src/kmplayerconfig.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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 ()) { |