Rename KApplication to TDEApplication to avoid conflicts with KDE4

8 files changed, 44 insertions, 44 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 5473df7..65d668b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2158,20 +2158,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 13729ee..693127c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1991,20 +1991,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/adept/adept/acqprogress.cpp b/adept/adept/acqprogress.cpp
index ff31e8f..91ba78a 100644
--- a/adept/adept/acqprogress.cpp
+++ b/adept/adept/acqprogress.cpp
@@ -130,7 +130,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
     }
     emit statusChanged( StWaiting );
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 }
 
 void AcqStatus::clear()
@@ -148,7 +148,7 @@ void AcqStatus::Start()
     _config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000);
     emit statusChanged( StWaiting );
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 }
 
 void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
@@ -161,7 +161,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
 
     kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 };
 
 void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
@@ -180,7 +180,7 @@ void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
     kdDebug() << "fetch called on ID = " << ID - 1 << " i = " << (void *)i << endl;
     emit statusChanged( StDownloading );
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 };
 
 void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
@@ -205,7 +205,7 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
     }
 
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 };
 
 void AcqStatus::Stop()
@@ -213,7 +213,7 @@ void AcqStatus::Stop()
     pkgAcquireStatus::Stop();
     emit statusChanged( StDone );
     triggerUpdate ();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 }
 
 bool AcqStatus::Pulse(pkgAcquire *Owner)
@@ -239,7 +239,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
                        CurrentItems)*100.0)/double(TotalBytes+TotalItems) ) );
     else
         emit totalProgress (-1);
-    KApplication::kApplication () -> processEvents ();
+    TDEApplication::kApplication () -> processEvents ();
 
     if ( m_continue )
         return true;
diff --git a/adept/batch/main.cpp b/adept/batch/main.cpp
index b0713d8..eed84e5 100644
--- a/adept/batch/main.cpp
+++ b/adept/batch/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options ); 
 
-    KApplication app;
+    TDEApplication app;
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     KGlobal::locale()->insertCatalogue(TQString::fromUtf8("libept"));
 
diff --git a/adept/installer/main.cpp b/adept/installer/main.cpp
index fb10492..c68c294 100644
--- a/adept/installer/main.cpp
+++ b/adept/installer/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
diff --git a/adept/libadept/acqprogress.cpp b/adept/libadept/acqprogress.cpp
index ff31e8f..91ba78a 100644
--- a/adept/libadept/acqprogress.cpp
+++ b/adept/libadept/acqprogress.cpp
@@ -130,7 +130,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
     }
     emit statusChanged( StWaiting );
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 }
 
 void AcqStatus::clear()
@@ -148,7 +148,7 @@ void AcqStatus::Start()
     _config -> Set ("APT::Fetcher::Select-Timeout-Usec", 100000);
     emit statusChanged( StWaiting );
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 }
 
 void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
@@ -161,7 +161,7 @@ void AcqStatus::IMSHit(pkgAcquire::ItemDesc &Itm)
 
     kdDebug() << "imshit called on ID = " << ID - 1 << " i = " << (void *)i << endl;
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 };
 
 void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
@@ -180,7 +180,7 @@ void AcqStatus::Fetch(pkgAcquire::ItemDesc &Itm)
     kdDebug() << "fetch called on ID = " << ID - 1 << " i = " << (void *)i << endl;
     emit statusChanged( StDownloading );
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 };
 
 void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
@@ -205,7 +205,7 @@ void AcqStatus::Fail(pkgAcquire::ItemDesc &Itm)
     }
 
     triggerUpdate();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 };
 
 void AcqStatus::Stop()
@@ -213,7 +213,7 @@ void AcqStatus::Stop()
     pkgAcquireStatus::Stop();
     emit statusChanged( StDone );
     triggerUpdate ();
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
 }
 
 bool AcqStatus::Pulse(pkgAcquire *Owner)
@@ -239,7 +239,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
                        CurrentItems)*100.0)/double(TotalBytes+TotalItems) ) );
     else
         emit totalProgress (-1);
-    KApplication::kApplication () -> processEvents ();
+    TDEApplication::kApplication () -> processEvents ();
 
     if ( m_continue )
         return true;
diff --git a/adept/manager/main.cpp b/adept/manager/main.cpp
index 2f0b88c..4b1eb73 100644
--- a/adept/manager/main.cpp
+++ b/adept/manager/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     // if (args && args->isSet("xy")) ...
diff --git a/adept/updater/main.cpp b/adept/updater/main.cpp
index 39c414d..0ec76eb 100644
--- a/adept/updater/main.cpp
+++ b/adept/updater/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
     // if (args && args->isSet("xy")) ...