Rename KApplication to TDEApplication to avoid conflicts with KDE4

4 files changed, 24 insertions, 24 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 0cf97f5..255ec52 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1924,20 +1924,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/k9author/k9menu.cpp b/k9author/k9menu.cpp
index ea9c622..c91ca5f 100644
--- a/k9author/k9menu.cpp
+++ b/k9author/k9menu.cpp
@@ -102,11 +102,11 @@ void k9Menu::createMenus(TQDomElement *_rootNode) {
     pixhi.setMask(mask);
     //save menu image
 
-    TQString bgFileName=m_workDir+KApplication::randomString(8)+".jpg";
-    TQString hiFileName=m_workDir+KApplication::randomString(8)+".png";
-    TQString m2vFileName= m_workDir+KApplication::randomString(8)+".m2v";
-    TQString mpaFileName= m_workDir+KApplication::randomString(8)+".m2v";
-    TQString mpgFileName= m_workDir+KApplication::randomString(8)+".mpg";
+    TQString bgFileName=m_workDir+TDEApplication::randomString(8)+".jpg";
+    TQString hiFileName=m_workDir+TDEApplication::randomString(8)+".png";
+    TQString m2vFileName= m_workDir+TDEApplication::randomString(8)+".m2v";
+    TQString mpaFileName= m_workDir+TDEApplication::randomString(8)+".m2v";
+    TQString mpgFileName= m_workDir+TDEApplication::randomString(8)+".mpg";
 
     pixbg.save(bgFileName,"JPEG",-1);
     pixhi.save(hiFileName,"PNG",-1);
@@ -210,7 +210,7 @@ void k9Menu::spumux(const TQString &_hiFileName,const TQString &_mpgFileName) {
         i++;
     }
 
-    TQString spuFileName(m_workDir + KApplication::randomString(8)+ ".xml");
+    TQString spuFileName(m_workDir + TDEApplication::randomString(8)+ ".xml");
     TQFile file( spuFileName );
     if ( file.open( IO_WriteOnly ) ) {
         TQTextStream stream( &file );
diff --git a/k9author/k9newdvd.cpp b/k9author/k9newdvd.cpp
index 454099e..013e02e 100644
--- a/k9author/k9newdvd.cpp
+++ b/k9author/k9newdvd.cpp
@@ -80,7 +80,7 @@ void k9NewDVD::createXML() {
 
     m_rootMenu->setWorkDir(m_workDir);
 
-    TQString menuFileName=m_workDir+KApplication::randomString(8)+".mpg";
+    TQString menuFileName=m_workDir+TDEApplication::randomString(8)+".mpg";
     m_rootMenu->setMenuFileName(menuFileName);
 
     m_xml=new TQDomDocument();
@@ -110,7 +110,7 @@ void k9NewDVD::createXML() {
     m_cancel=m_processList->getCancel();
     bool error=false;
     if (!m_cancel) {
-        TQString dvdAuthor(m_workDir+"/"+KApplication::randomString(8)+".xml");
+        TQString dvdAuthor(m_workDir+"/"+TDEApplication::randomString(8)+".xml");
         TQFile file( dvdAuthor);
 
         file.open(IO_WriteOnly);
@@ -154,7 +154,7 @@ void k9NewDVD::addTitles (TQDomElement &_root) {
         TQDomElement pgc;
         k9Menu *menu=title->getMenu();
         menu->setWorkDir(m_workDir);
-        TQString menuFileName=m_workDir+KApplication::randomString(8)+".mpg";
+        TQString menuFileName=m_workDir+TDEApplication::randomString(8)+".mpg";
         m_tmpFiles << menuFileName,
         menu->setMenuFileName(menuFileName);
         m_processList->addProgress(i18n("Creating menu for title %1").arg(title->getNum()+1));
@@ -225,7 +225,7 @@ void k9NewDVD::createMencoderCmd(TQString &_cmd,TQString &_chapters, k9AviFile *
         }
     } while (!bEnd);
 
-    TQString fileName= m_workDir + KApplication::randomString(8)+".mpeg";
+    TQString fileName= m_workDir + TDEApplication::randomString(8)+".mpeg";
     TQString t1=_aviFile->getStart().toString("hh:mm:ss.zzz");
     int length=_aviFile->getStart().msecsTo(end);
     TQTime l;
diff --git a/src/main.cpp b/src/main.cpp
index 2b200d5..dd03af6 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -72,7 +72,7 @@ int main(int argc, char **argv) {
     TDECmdLineArgs::init(argc, argv, &about);
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
     //    kMainDlg *mainWin = 0;
 
     // see if we are starting with session management