Rename KApplication to TDEApplication to avoid conflicts with KDE4

3 files changed, 15 insertions, 15 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 5cbd21b..216e05c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2003,20 +2003,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/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index b301069..7d7b886 100644
--- a/yakuake/src/main_window.cpp
+++ b/yakuake/src/main_window.cpp
@@ -324,7 +324,7 @@ void MainWindow::showPopup(const TQString& text, int time)
 {
     /* Show a passive popup with the given text. */
 
-    popup.setView(i18n("Yakuake Notification"), text, KApplication::kApplication()->miniIcon());
+    popup.setView(i18n("Yakuake Notification"), text, TDEApplication::kApplication()->miniIcon());
     popup.setTimeout(time);
     popup.show();
 }
diff --git a/yakuake/src/translucent_widget.cpp b/yakuake/src/translucent_widget.cpp
index 5a1f59a..1afe1b2 100644
--- a/yakuake/src/translucent_widget.cpp
+++ b/yakuake/src/translucent_widget.cpp
@@ -37,7 +37,7 @@ TranslucentWidget::~TranslucentWidget()
 void TranslucentWidget::slotUpdateBackground()
 {
 
-    // This is wired up to KApplication::backgroundChanged and needed
+    // This is wired up to TDEApplication::backgroundChanged and needed
     // to kick KRootPixmap into updating the background again, which
     // it likes to forget after having been moved off-screen.
     if (root_pixmap) root_pixmap->repaint(true);