Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 16 insertions, 16 deletions

diff --git a/src/kmplayer_part.cpp b/src/kmplayer_part.cpp
index 9b6ec3f..9a54470 100644
--- a/src/kmplayer_part.cpp
+++ b/src/kmplayer_part.cpp
@@ -393,7 +393,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerPart::~KMPlayerPart () {
 }
 
 TDE_NO_EXPORT bool KMPlayerPart::allowRedir (const KURL & url) const {
-    return kapp->authorizeURLAction ("redirect", m_docbase, url);
+    return tdeApp->authorizeURLAction ("redirect", m_docbase, url);
 }
 
 TDE_NO_EXPORT void KMPlayerPart::setAutoControls (bool b) {
@@ -464,7 +464,7 @@ TDE_NO_EXPORT bool KMPlayerPart::openURL (const KURL & _url) {
                     break;
                 }
     }
-    if (m_havehref && (!kapp->authorizeURLAction ("redirect", url, urlsource->url ()) || !m_settings->allowhref)) {
+    if (m_havehref && (!tdeApp->authorizeURLAction ("redirect", url, urlsource->url ()) || !m_settings->allowhref)) {
         m_havehref = false;
         url = urlsource->url ();
     }
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 414ac08..3c4f98a 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -498,7 +498,7 @@ TDE_NO_EXPORT KMPlayer::NodePtr HtmlObject::childFromTag (const TQString & tag)
 
 KDE_NO_CDTOR_EXPORT KMPlayerApp::KMPlayerApp(TQWidget* , const char* name)
     : TDEMainWindow(0, name),
-      config (kapp->config ()),
+      config (tdeApp->config ()),
       m_systray (0L),
       m_player (new KMPlayer::PartBase (this, 0L, 0L, 0L, config)),
       m_view (static_cast <KMPlayer::View*> (m_player->view())),
@@ -1322,9 +1322,9 @@ TDE_NO_EXPORT bool KMPlayerApp::queryClose () {
     if (!m_dcopName.isEmpty ()) {
         TQCString replytype;
         TQByteArray data, replydata;
-        kapp->dcopClient ()->call (m_dcopName, "MainApplication-Interface", "quit()", data, replytype, replydata);
+        tdeApp->dcopClient ()->call (m_dcopName, "MainApplication-Interface", "quit()", data, replytype, replydata);
     }
-    if (m_played_exit || m_player->settings ()->no_intro || kapp->sessionSaving() )
+    if (m_played_exit || m_player->settings ()->no_intro || tdeApp->sessionSaving() )
         return true;
     if (m_auto_resize)
         disconnect(m_player, TQ_SIGNAL(sourceDimensionChanged()),this,TQ_SLOT(zoom100()));
@@ -1682,11 +1682,11 @@ TDE_NO_EXPORT void KMPlayerApp::preparePlaylistMenu (KMPlayer::PlayListItem * it
 TDE_NO_EXPORT void KMPlayerApp::startArtsControl () {
     TQCString fApp, fObj;
     TQByteArray data, replydata;
-    QCStringList apps = kapp->dcopClient ()->registeredApplications();
+    QCStringList apps = tdeApp->dcopClient ()->registeredApplications();
     QCStringList::ConstIterator end( apps.end() );
     for( QCStringList::ConstIterator it = apps.begin(); it != end; ++it)
         if (!strncmp ((*it).data (), "artscontrol", 11)) {
-            kapp->dcopClient ()->findObject
+            tdeApp->dcopClient ()->findObject
                 (*it, "artscontrol-mainwindow#1", "raise()", data, fApp, fObj);
             return;
         }
@@ -1694,7 +1694,7 @@ TDE_NO_EXPORT void KMPlayerApp::startArtsControl () {
     TQCString replytype;
     TQDataStream stream (data, IO_WriteOnly);
     stream << TQString ("aRts Control Tool") << args;
-    if (kapp->dcopClient ()->call ("tdelauncher", "tdelauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) {
+    if (tdeApp->dcopClient ()->call ("tdelauncher", "tdelauncher", "start_service_by_name(TQString,TQStringList)", data, replytype, replydata)) {
         int result;
         TQDataStream replystream (replydata, IO_ReadOnly);
         replystream >> result >> m_dcopName;
diff --git a/src/kmplayerconfig.cpp b/src/kmplayerconfig.cpp
index 7467fde..c1b9d1d 100644
--- a/src/kmplayerconfig.cpp
+++ b/src/kmplayerconfig.cpp
@@ -369,7 +369,7 @@ TDE_NO_EXPORT bool Settings::createDialog () {
             this, TQ_SLOT (okPressed ()));
     connect (configdialog, TQ_SIGNAL (applyClicked ()),
             this, TQ_SLOT (okPressed ()));
-    if (TDEApplication::kApplication())
+    if (tdeApp)
         connect (configdialog, TQ_SIGNAL (helpClicked ()),
                 this, TQ_SLOT (getHelp ()));
     return true;
@@ -734,7 +734,7 @@ void Settings::okPressed () {
 }
 
 TDE_NO_EXPORT void Settings::getHelp () {
-    TDEApplication::kApplication()->invokeBrowser ("man:/mplayer");
+    tdeApp->invokeBrowser ("man:/mplayer");
 }
 
 #include "kmplayerconfig.moc"
diff --git a/src/kmplayerpartbase.cpp b/src/kmplayerpartbase.cpp
index 2d5d3db..fa3ab4d 100644
--- a/src/kmplayerpartbase.cpp
+++ b/src/kmplayerpartbase.cpp
@@ -1778,7 +1778,7 @@ bool URLSource::requestPlayURL (NodePtr mrl) {
 #else
             dest.isLocalFile () &&
 #endif
-                !kapp->authorizeURLAction ("redirect", base, dest)) {
+                !tdeApp->authorizeURLAction ("redirect", base, dest)) {
             kdWarning () << "requestPlayURL from document " << base << " to play " << dest << " is not allowed" << endl;
             return false;
         }
diff --git a/src/kmplayerprocess.cpp b/src/kmplayerprocess.cpp
index 9057090..bface29 100644
--- a/src/kmplayerprocess.cpp
+++ b/src/kmplayerprocess.cpp
@@ -1420,7 +1420,7 @@ bool CallbackProcess::contrast (int val, bool b) {
 
 TQString CallbackProcess::dcopName () {
     TQString cbname;
-    cbname.sprintf ("%s/%s", TQString (kapp->dcopClient ()->appId ()).ascii (),
+    cbname.sprintf ("%s/%s", TQString (tdeApp->dcopClient ()->appId ()).ascii (),
                              TQString (m_callback->objId ()).ascii ());
     return cbname;
 }
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 92c017a..ed9b5f6 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -223,7 +223,7 @@ TDE_NO_EXPORT void View::init (TDEActionCollection * action_collection) {
     setAcceptDrops (true);
     m_view_area->resizeEvent (0L);
 
-    kapp->installX11EventFilter (this);
+    tdeApp->installX11EventFilter (this);
 }
 
 KDE_NO_CDTOR_EXPORT View::~View () {
@@ -348,11 +348,11 @@ TDE_NO_EXPORT void View::updateVolume () {
     TQByteArray data, replydata;
     TQCString replyType;
     int volume;
-    bool has_mixer = kapp->dcopClient ()->call (m_mixer_object, "Mixer0",
+    bool has_mixer = tdeApp->dcopClient ()->call (m_mixer_object, "Mixer0",
             "masterVolume()", data, replyType, replydata);
     if (!has_mixer) {
         m_mixer_object = "kmix";
-        has_mixer = kapp->dcopClient ()->call (m_mixer_object, "Mixer0",
+        has_mixer = tdeApp->dcopClient ()->call (m_mixer_object, "Mixer0",
                 "masterVolume()", data, replyType, replydata);
     }
     if (has_mixer) {
@@ -457,7 +457,7 @@ TDE_NO_EXPORT void View::setVolume (int vol) {
     TQByteArray data;
     TQDataStream arg( data, IO_WriteOnly );
     arg << vol;
-    if (!kapp->dcopClient()->send (m_mixer_object, "Mixer0", "setMasterVolume(int)", data))
+    if (!tdeApp->dcopClient()->send (m_mixer_object, "Mixer0", "setMasterVolume(int)", data))
         kdWarning() << "Failed to update volume" << endl;
 }