Rename KApplication to TDEApplication to avoid conflicts with KDE4

7 files changed, 12 insertions, 12 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index f3568543..49f12597 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -800,13 +800,13 @@ void LanguageOptions::enableLangWidgets()
 
   //kdDebug() << "enabled? " << enabled << endl;
 
-  if (enabled && KApplication::dcopClient()->isApplicationRegistered("kxkb"))
+  if (enabled && TDEApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
     TQByteArray data;
     TQCString replyType;
     TQByteArray replyData;
 
-    if (!KApplication::dcopClient()->call("kxkb", "kxkb", "getLayoutsList()", data, replyType, replyData))
+    if (!TDEApplication::dcopClient()->call("kxkb", "kxkb", "getLayoutsList()", data, replyType, replyData))
     {
       //kdDebug() << "kxkb dcop error" << endl;
     }
diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp
index a04ed0ca..ba88b13e 100644
--- a/kvoctrain/kvoctrain/kva_config.cpp
+++ b/kvoctrain/kvoctrain/kva_config.cpp
@@ -34,7 +34,7 @@
 
 void kvoctrainApp::saveOptions()
 {
-  KConfig *config = KApplication::kApplication()->config();
+  KConfig *config = TDEApplication::kApplication()->config();
   fileOpenRecent->saveEntries(config, "Recent Files");
 
   if (view)
@@ -75,7 +75,7 @@ void kvoctrainApp::saveLanguages()
 
 void kvoctrainApp::readOptions()
 {
-  KConfig *config = KApplication::kApplication()->config();
+  KConfig *config = TDEApplication::kApplication()->config();
   fileOpenRecent->loadEntries(config, "Recent Files");
   /*
   int ls = Prefs::numPreSetting();
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index 9c046c50..c67347c2 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -100,7 +100,7 @@ public:
   void readLanguages();
 
   /** saves the window properties for each open window during session end to the session config file, including saving the currently
-  * opened file by a temporary filename provided by KApplication.
+  * opened file by a temporary filename provided by TDEApplication.
   * @see KMainWindow#saveProperties
   */
   virtual void saveProperties(KConfig* );
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index e8fad704..d432ab1b 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -78,7 +78,7 @@ void KVocTrainTable::setCurrentItem(int row)
 /*
 TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
 {
-  if (KApplication::dcopClient()->isApplicationRegistered("kxkb"))
+  if (TDEApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
     if (m_doc)
     {
@@ -95,7 +95,7 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace)
           TQDataStream arg(data, IO_WriteOnly);
           arg << kbLayout;
 
-          if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData))
+          if (!TDEApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData))
           {
             kdDebug() << "kxkb dcop error: beginEdit()" << endl;
           }
@@ -575,7 +575,7 @@ void KVocTrainTable::activateNextCell()
 void KVocTrainTable::slotCurrentChanged(int row, int col)
 {
   Q_UNUSED(row);
-  if (KApplication::dcopClient()->isApplicationRegistered("kxkb"))
+  if (TDEApplication::dcopClient()->isApplicationRegistered("kxkb"))
   {
     if (m_doc)
     {
@@ -592,7 +592,7 @@ void KVocTrainTable::slotCurrentChanged(int row, int col)
           TQDataStream arg(data, IO_WriteOnly);
           arg << kbLayout;
 
-          if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData))
+          if (!TDEApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData))
           {
             kdDebug() << "kxkb dcop error: beginEdit()" << endl;
           }
diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h
index e1259f1a..9630ffee 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.h
+++ b/kvoctrain/kvoctrain/kvoctrainview.h
@@ -33,7 +33,7 @@
 
 class TQGridLayout;
 class TQFrame;
-class KApplication;
+class TDEApplication;
 class KPrinter;
 class kvoctrainExpr;
 class KVocTrainTable;
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 9d4519f8..d0eba568 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -94,7 +94,7 @@ static const char version[]     = KVOCTRAIN_VERSION_STRING;
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
-  KApplication app;
+  TDEApplication app;
 
   kvoctrainApp *kva = 0;
   if (app.isRestored()) {
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index 1f722230..99017a6a 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -301,7 +301,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year)
 int main(int argc, char **argv)
 {
   // use i18n-strings from kvoctrain
-  KApplication app(argc,argv, "kvoctrain");
+  TDEApplication app(argc,argv, "kvoctrain");
 
   if (argc != 4) {
     cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit().data();