Rename KApplication to TDEApplication to avoid conflicts with KDE4

7 files changed, 24 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c2ba6e..61c1c09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -963,7 +963,7 @@ Smb4K 0.4.1:
 - Fixed malfunction when super program was chosen and became deinstalled.
 - Fixed handling of passwords with special characters (closes #2146).
 - Fixed problems opening shares with Konqueror by moving from
-  KApplication::invokeBrowser() to KRun.
+  TDEApplication::invokeBrowser() to KRun.
 - Fixed two potential crashes by adding NULL pointers to the return statements
   of Smb4KMounter::findShareByName() and Smb4KMounter::findShareByPath().
 - Fixed blocking of KDE's logout if the main window was open.
diff --git a/acinclude.m4 b/acinclude.m4
index 7ea922d..1edefdf 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/smb4k/core/smb4kcore.h b/smb4k/core/smb4kcore.h
index 5d6c154..e49b4db 100644
--- a/smb4k/core/smb4kcore.h
+++ b/smb4k/core/smb4kcore.h
@@ -247,7 +247,7 @@ class Smb4KCore : public TQObject
     void slotSetPreviewerState( int state );
 
     /**
-     * This slot is connected to the KApplication::shutDown() signal. It is invoked
+     * This slot is connected to the TDEApplication::shutDown() signal. It is invoked
      * when the application is shut down by the KDE logout or by pressing CTRL+Q, etc.
      */
     void slotShutdown();
diff --git a/smb4k/core/smb4kfileio.h b/smb4k/core/smb4kfileio.h
index 8411642..c6b589c 100644
--- a/smb4k/core/smb4kfileio.h
+++ b/smb4k/core/smb4kfileio.h
@@ -121,7 +121,7 @@ class Smb4KFileIO : public TQObject
   protected slots:
     /**
      * This slot is invokes when the application is closed. It is connected
-     * to KApplication::shutDown().
+     * to TDEApplication::shutDown().
      */
     void slotShutdown();
 
diff --git a/smb4k/core/smb4kmounter.h b/smb4k/core/smb4kmounter.h
index dd151d6..968b2c5 100644
--- a/smb4k/core/smb4kmounter.h
+++ b/smb4k/core/smb4kmounter.h
@@ -165,7 +165,7 @@ class Smb4KMounter : public TQObject
     /**
      * This function executes Smb4KMounter::slotShutdown(). Under normal circumstances,
      * there is no need to use this function, because everything that is done here is
-     * also done when KApplication::shutDown() is emitted. However, it comes in handy
+     * also done when TDEApplication::shutDown() is emitted. However, it comes in handy
      * when you need to perform last actions in a plugin.
      */
     void prepareForShutdown();
@@ -250,7 +250,7 @@ class Smb4KMounter : public TQObject
     void slotReceivedStderr( KProcess *, char *buf, int len );
 
     /**
-     * This slot is called by the KApplication::shutDown() signal.
+     * This slot is called by the TDEApplication::shutDown() signal.
      * Is does everything that has to be done before the program
      * really exits.
      */
diff --git a/smb4k/core/smb4ksynchronizer.h b/smb4k/core/smb4ksynchronizer.h
index c4ebc44..80ddc55 100644
--- a/smb4k/core/smb4ksynchronizer.h
+++ b/smb4k/core/smb4ksynchronizer.h
@@ -155,7 +155,7 @@ class Smb4KSynchronizer : public TQObject
     void slotReceivedStderr( KProcess *proc, char *buf, int len );
 
     /**
-     * This slot is connected to KApplication::shutDown() signal.
+     * This slot is connected to TDEApplication::shutDown() signal.
      * It aborts the running KProcess if necessary.
      */
     void slotShutdown();
diff --git a/smb4k/smb4k.cpp b/smb4k/smb4k.cpp
index fe276f3..a0c90a2 100644
--- a/smb4k/smb4k.cpp
+++ b/smb4k/smb4k.cpp
@@ -268,7 +268,7 @@ void Smb4KApp::setupView()
   {
     KMessageBox::error( 0, "<qt>"+KLibLoader::self()->lastErrorMessage()+"</qt>" );
 
-    KApplication::exit( 0 );
+    TDEApplication::exit( 0 );
 
     return;
   }
@@ -297,7 +297,7 @@ void Smb4KApp::setupView()
   {
     KMessageBox::error( 0, "<qt>"+KLibLoader::self()->lastErrorMessage()+"</qt>" );
 
-    KApplication::exit( 0 );
+    TDEApplication::exit( 0 );
 
     return;
   }
@@ -336,7 +336,7 @@ void Smb4KApp::setupView()
   {
     KMessageBox::error( 0, "<qt>"+KLibLoader::self()->lastErrorMessage()+"</qt>" );
 
-    KApplication::exit( 0 );
+    TDEApplication::exit( 0 );
 
     return;
   }
@@ -421,7 +421,7 @@ void Smb4KApp::changeSharesView()
   {
     KMessageBox::error( 0, "<qt>"+KLibLoader::self()->lastErrorMessage()+"</qt>" );
 
-    KApplication::exit( 0 );
+    TDEApplication::exit( 0 );
 
     return;
   }
@@ -500,7 +500,7 @@ void Smb4KApp::slotQuit()
     m_system_tray->embed( false );
   }
 
-  KApplication::exit( 0 );
+  TDEApplication::exit( 0 );
 }