Rename KApplication to TDEApplication to avoid conflicts with KDE4

8 files changed, 34 insertions, 34 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index ea3168e..d6a7783 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/aclocal.m4 b/aclocal.m4
index 6e06bb7..6f0c1f0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2015,20 +2015,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/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 34368e6..c4e29fc 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -582,7 +582,7 @@ void KTorrent::setupActions()
 
 bool KTorrent::queryClose()
 {
-	if (Settings::showSystemTrayIcon() && !KApplication::kApplication()->sessionSaving())
+	if (Settings::showSystemTrayIcon() && !TDEApplication::kApplication()->sessionSaving())
 	{
 		hide();
 		return false;
diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp
index de0984a..da8a9f4 100644
--- a/apps/ktorrent/ktorrentcore.cpp
+++ b/apps/ktorrent/ktorrentcore.cpp
@@ -741,7 +741,7 @@ void KTorrentCore::makeTorrent(const TQString & file,const TQStringList & tracke
 			prog->setProgress(ns);
 			ns++;
 			if (ns % 10 == 0)
-				KApplication::kApplication()->processEvents();
+				TDEApplication::kApplication()->processEvents();
 		}
 
 		mktor.saveTorrent(output_file);
diff --git a/apps/ktupnptest/main.cpp b/apps/ktupnptest/main.cpp
index 65fa4d8..97461ae 100644
--- a/apps/ktupnptest/main.cpp
+++ b/apps/ktupnptest/main.cpp
@@ -53,7 +53,7 @@ int main(int argc,char** argv)
 					 "http://ktorrent.org/");
 	TDECmdLineArgs::init(argc, argv,&about);
 	TDECmdLineArgs::addCmdLineOptions( options );
-	KApplication app;
+	TDEApplication app;
 	Globals::instance().initLog(kt::DataDir() + "ktupnptest.log");
 	UPnPTestApp* mwnd = new UPnPTestApp();
 
diff --git a/libktorrent/datachecker/multidatachecker.cpp b/libktorrent/datachecker/multidatachecker.cpp
index e98a64f..d791f97 100644
--- a/libktorrent/datachecker/multidatachecker.cpp
+++ b/libktorrent/datachecker/multidatachecker.cpp
@@ -94,7 +94,7 @@ namespace bt
 			if (now - last_update_time > 1000)
 			{
 				Out() << "Checked " << cur_chunk << " chunks" << endl;
-			//	KApplication::kApplication()->processEvents();
+			//	TDEApplication::kApplication()->processEvents();
 				last_update_time = now;
 			}
 		}	
diff --git a/plugins/ipfilter/convertdialog.cpp b/plugins/ipfilter/convertdialog.cpp
index 8c9cf5a..95fb22a 100644
--- a/plugins/ipfilter/convertdialog.cpp
+++ b/plugins/ipfilter/convertdialog.cpp
@@ -122,7 +122,7 @@ namespace kt
 				if(canceled)
 					return;
 				
-				KApplication::kApplication() ->processEvents();
+				TDEApplication::kApplication() ->processEvents();
 				TQString line = stream.readLine();
 				i += line.length() * sizeof( char ); //rough estimation of string size
 				kProgress1->setProgress( i * 100 / source_size );
@@ -184,7 +184,7 @@ namespace kt
 					if ( i % 10000 == 0 )
 						Out(SYS_IPF|LOG_DEBUG) << "Block " << i << " written." << endl;
 				}
-				KApplication::kApplication()->processEvents();
+				TDEApplication::kApplication()->processEvents();
 				
 				if(canceled)
 					return;
@@ -206,7 +206,7 @@ namespace kt
 			converting = false;
 		}
 
-		KApplication::kApplication()->processEvents();
+		TDEApplication::kApplication()->processEvents();
 		//reload level1 filter
 		if ( m_plugin )
 			m_plugin->loadAntiP2P();
diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp
index f66a53d..721c112 100644
--- a/plugins/rssfeed/rss/testlibrss.cpp
+++ b/plugins/rssfeed/rss/testlibrss.cpp
@@ -61,7 +61,7 @@ int main( int argc, char **argv )
 	KAboutData aboutData( "testlibrss", "testlibrss", "0.1" );
 	TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
-	KApplication app;
+	TDEApplication app;
 
         TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
         if ( args->count() != 1 ) args->usage();