Rename KApplication to TDEApplication to avoid conflicts with KDE4

2 files changed, 21 insertions, 21 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 236b889..f9ad9fc 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/src/MainWidget.cpp b/src/MainWidget.cpp
index d1b0111..af0e731 100644
--- a/src/MainWidget.cpp
+++ b/src/MainWidget.cpp
@@ -499,7 +499,7 @@ MainWidget::MainWidget ( KAboutData *about, bool tren, TQWidget *parent, const c
 		tray = new KbdTray ( this );
 		tray->setPixmap ( UserIcon ( "tray" ) );
 	
-		KConfig *cfg = KApplication::kApplication()->config();
+		KConfig *cfg = TDEApplication::kApplication()->config();
 	
 		KPopupMenu *m = tray->contextMenu();
 		m->setCheckable ( true );
@@ -560,7 +560,7 @@ MainWidget::MainWidget ( KAboutData *about, bool tren, TQWidget *parent, const c
 
 void MainWidget::finishInit()
 {
-	KConfig *cfg = KApplication::kApplication()->config();
+	KConfig *cfg = TDEApplication::kApplication()->config();
 	bool vis = cfg->readBoolEntry("visible",true);
 	if (vis) {
 		show();
@@ -586,7 +586,7 @@ void MainWidget::restorePosition()
 	TQRect dflt_geom(screen_geom.width()-d_width,screen_geom.height()-d_height,d_width,d_height);
 
 	KConfig *cfg = 0;
-	cfg = KApplication::kApplication()->config();
+	cfg = TDEApplication::kApplication()->config();
 	if (cfg){
 		TQRect geom  = cfg->readRectEntry("geometry");
 		if (!geom.isNull() && geom.isValid()) {
@@ -598,7 +598,7 @@ void MainWidget::restorePosition()
 void MainWidget::saveState()
 {
 	KConfig *cfg = 0;
-	cfg = KApplication::kApplication()->config();
+	cfg = TDEApplication::kApplication()->config();
 	if (cfg){
 		cfg->writeEntry("visible",isShown());
 		cfg->sync();
@@ -608,7 +608,7 @@ void MainWidget::hideEvent ( TQHideEvent * )
 {
 	
 	KConfig *cfg = 0;
-	cfg = KApplication::kApplication()->config();
+	cfg = TDEApplication::kApplication()->config();
 	if (cfg){
 		cfg->writeEntry("geometry",geometry());
 		cfg->sync();
@@ -715,7 +715,7 @@ void MainWidget::chooseFont()
         // value, in this case Helvetica [Cronyx], 10
     }
 	
-	KConfig *cfg = KApplication::kApplication()->config();
+	KConfig *cfg = TDEApplication::kApplication()->config();
 	cfg->writeEntry ("KvkbdFont", this->font());
 	cfg->sync();
 	
@@ -740,7 +740,7 @@ void MainWidget::showDock()
 		tray->contextMenu()->setItemChecked ( mnu_dock, !c );
 		dock->show();
 	}
-	KConfig *cfg = KApplication::kApplication()->config();
+	KConfig *cfg = TDEApplication::kApplication()->config();
 	cfg->writeEntry ("showdock", !c);
 	cfg->sync();
 	
@@ -749,7 +749,7 @@ void MainWidget::toggleFontAutoRes()
 {
 	bool c = tray->contextMenu()->isItemChecked( mnu_autores);
 	tray->contextMenu()->setItemChecked(mnu_autores, !c);
-	KConfig *cfg = KApplication::kApplication()->config();
+	KConfig *cfg = TDEApplication::kApplication()->config();
 	cfg->writeEntry ("autoresfont", !c);
 	cfg->sync();
 }