Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 18 insertions, 18 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 3e9154b..15a6629 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/kvpnc.cpp b/src/kvpnc.cpp
index 4a22b1e..c79d956 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -111,7 +111,7 @@
 
 //END includes
 
-KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
+KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
 {
 	this->parent = parent;
 	setCaption ( i18n ( "KVpnc" ) );
diff --git a/src/kvpnc.h b/src/kvpnc.h
index 40ad2f3..6c50c4e 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.h
@@ -80,7 +80,7 @@ public:
 	* @param parent Parent widget
 	* @param name Name of the Mainwindow
 	*/
-	KVpnc( KApplication *parent, TQWidget *qparent = 0, const char *name = 0 );
+	KVpnc( TDEApplication *parent, TQWidget *qparent = 0, const char *name = 0 );
 
 	/**
 	* Destruktor
@@ -145,7 +145,7 @@ private:
 	enum ConnectionStatus {disconnected=0, connecting=1, connected=2};
 	enum LogType {info=0, remote=1, error=2, success=3, debug=4};
 
-	KApplication *parent;
+	TDEApplication *parent;
 	TQStringList *env;
 
 	KVpncConfig *GlobalConfig;
diff --git a/src/main.cpp b/src/main.cpp
index 83b42aa..00546de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -116,10 +116,10 @@ int main ( int argc, char *argv[] )
 	TDECmdLineArgs::init ( argc, argv, &aboutData);
 
 	// Add options from other components
-	KApplication::addCmdLineOptions();
+	TDEApplication::addCmdLineOptions();
 	TDECmdLineArgs::addCmdLineOptions ( options );
 
-	KApplication a;
+	TDEApplication a;
 	KVpnc *kvpnc =  new KVpnc ( &a );
 
 	DCOPClient* dcop = a.dcopClient();