Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 7 insertions, 7 deletions

diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp
index f6eaa34b..1b86867b 100644
--- a/kmrml/kmrml/kcontrol/indextest.cpp
+++ b/kmrml/kmrml/kcontrol/indextest.cpp
@@ -36,7 +36,7 @@ void IndexTest::slotProgress( int percent, const TQString& message )
 
 int main( int argc, char **argv )
 {
-    KApplication app( argc, argv, "indextest" );
+    TDEApplication app( argc, argv, "indextest" );
     IndexTest *test = new IndexTest();
 
     return app.exec();
diff --git a/kmrml/kmrml/lib/kmrml_config.cpp b/kmrml/kmrml/lib/kmrml_config.cpp
index 1a0f1ac5..94aafa4a 100644
--- a/kmrml/kmrml/lib/kmrml_config.cpp
+++ b/kmrml/kmrml/lib/kmrml_config.cpp
@@ -94,7 +94,7 @@ bool Config::sync()
     return notifySlaves;
 
     // This moved to kcontrol/MainPage::save() so we don't have to link against
-    // KIO and need a full KApplication instance to work (so that the tiny
+    // KIO and need a full TDEApplication instance to work (so that the tiny
     // mrmlsearch binary can also use this class)
     // tell the ioslaves about the new configuration
 //     if ( notifySlaves )
diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp
index a9390097..56074222 100644
--- a/kmrml/kmrml/mrml_part.cpp
+++ b/kmrml/kmrml/mrml_part.cpp
@@ -284,7 +284,7 @@ bool MrmlPart::openURL( const KURL& url )
                                             "kmrml_ask_configure_gift" )
                  == KMessageBox::Yes )
             {
-                KApplication::tdeinitExec( "kcmshell",
+                TDEApplication::tdeinitExec( "kcmshell",
                                            TQString::fromLatin1("kcmkmrml"));
                 setStatus( NeedCollection );
                 return false;
diff --git a/kmrml/kmrml/server/watcher.cpp b/kmrml/kmrml/server/watcher.cpp
index ce569bab..fe393933 100644
--- a/kmrml/kmrml/server/watcher.cpp
+++ b/kmrml/kmrml/server/watcher.cpp
@@ -34,15 +34,15 @@ Watcher::Watcher( const TQCString& name )
     m_daemons.setAutoDelete( true );
 
     // safety, for clients that die without unregistering
-    KApplication::dcopClient()->setNotifications( true );
-    connect( KApplication::dcopClient(),
+    TDEApplication::dcopClient()->setNotifications( true );
+    connect( TDEApplication::dcopClient(),
              TQT_SIGNAL( applicationRemoved( const TQCString& )),
              TQT_SLOT( slotAppUnregistered( const TQCString& )));
 }
 
 Watcher::~Watcher()
 {
-    KApplication::dcopClient()->setNotifications( false );
+    TDEApplication::dcopClient()->setNotifications( false );
 }
 
 bool Watcher::requireDaemon( const TQCString& clientAppId,
@@ -51,7 +51,7 @@ bool Watcher::requireDaemon( const TQCString& clientAppId,
                              uint timeout /* seconds */,
                              int restartOnFailure )
 {
-    if ( !KApplication::dcopClient()->isApplicationRegistered( clientAppId ) )
+    if ( !TDEApplication::dcopClient()->isApplicationRegistered( clientAppId ) )
         kdWarning() << "Watcher::requireDaemon: " << daemonKey
                     << ": Client AppID is not registered with DCOP: "
                     << clientAppId << endl;