Rename a number of libraries and executables to avoid conflicts with KDE4

1 files changed, 34 insertions, 34 deletions

diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 721dfab..8c58101 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -51,10 +51,10 @@
 #include <kshortcut.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmenubar.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -62,12 +62,12 @@
 #include <ktip.h>
 #include <kkeydialog.h>
 #include <kprogress.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <dcopclient.h>
 #include <kstartupinfo.h>
 #include <tdeparts/componentfactory.h>
 #include <krun.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kinputdialog.h>
 
 // ----------------------------------------------------------------------------
@@ -93,7 +93,7 @@
 #include "dialogs/kimportdlg.h"
 #include "dialogs/mymoneyqifprofileeditor.h"
 #include "dialogs/kenterscheduledlg.h"
-#include "dialogs/kconfirmmanualenterdlg.h"
+#include "dialogs/tdeconfirmmanualenterdlg.h"
 #include "dialogs/kmymoneypricedlg.h"
 #include "dialogs/kcurrencyeditdlg.h"
 #include "dialogs/kequitypriceupdatedlg.h"
@@ -2408,10 +2408,10 @@ void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount
   } else {
     // we should not keep the 'no' setting because that can confuse people like
     // I have seen in some usability tests. So we just delete it right away.
-    TDEConfig *kconfig = TDEGlobal::config();
-    if(kconfig) {
-      kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
-      kconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories"));
+    TDEConfig *tdeconfig = TDEGlobal::config();
+    if(tdeconfig) {
+      tdeconfig->setGroup(TQString::fromLatin1("Notification Messages"));
+      tdeconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories"));
     }
   }
 }
@@ -2582,10 +2582,10 @@ void KMyMoney2App::slotInvestmentDelete(void)
   } else {
     // we should not keep the 'no' setting because that can confuse people like
     // I have seen in some usability tests. So we just delete it right away.
-    TDEConfig *kconfig = TDEGlobal::config();
-    if(kconfig) {
-      kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
-      kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment"));
+    TDEConfig *tdeconfig = TDEGlobal::config();
+    if(tdeconfig) {
+      tdeconfig->setGroup(TQString::fromLatin1("Notification Messages"));
+      tdeconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment"));
     }
   }
 }
@@ -3777,10 +3777,10 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id)
       doit = false;
       // we should not keep the 'no' setting because that can confuse people like
       // I have seen in some usability tests. So we just delete it right away.
-      TDEConfig *kconfig = TDEGlobal::config();
-      if(kconfig) {
-        kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
-        kconfig->deleteEntry(dontAskAgain);
+      TDEConfig *tdeconfig = TDEGlobal::config();
+      if(tdeconfig) {
+        tdeconfig->setGroup(TQString::fromLatin1("Notification Messages"));
+        tdeconfig->deleteEntry(dontAskAgain);
       }
     }
   }
@@ -4263,7 +4263,7 @@ void KMyMoney2App::slotKDELanguageSettings(void)
   TQString error;
   int pid;
 
-  TDEApplication::tdeinitExec("kcmshell", args, &error, &pid);
+  TDEApplication::tdeinitExec("tdecmshell", args, &error, &pid);
 }
 
 void KMyMoney2App::slotNewFeature(void)
@@ -5751,28 +5751,28 @@ void KMyMoney2App::slotCheckSchedules(void)
 void KMyMoney2App::writeLastUsedDir(const TQString& directory)
 {
   //get global config object for our app.
-  TDEConfig *kconfig = TDEGlobal::config();
-  if(kconfig)
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  if(tdeconfig)
   {
-    kconfig->setGroup("General Options");
+    tdeconfig->setGroup("General Options");
 
     //write path entry, no error handling since its void.
-    kconfig->writePathEntry("LastUsedDirectory", directory);
+    tdeconfig->writePathEntry("LastUsedDirectory", directory);
   }
 }
 
 void KMyMoney2App::writeLastUsedFile(const TQString& fileName)
 {
   //get global config object for our app.
-  TDEConfig *kconfig = TDEGlobal::config();
-  if(kconfig)
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  if(tdeconfig)
   {
-    kconfig->setGroup("General Options");
+    tdeconfig->setGroup("General Options");
 
     // write path entry, no error handling since its void.
     // use a standard string, as fileName could contain a protocol
     // e.g. file:/home/thb/....
-    kconfig->writeEntry("LastUsedFile", fileName);
+    tdeconfig->writeEntry("LastUsedFile", fileName);
   }
 }
 
@@ -5781,13 +5781,13 @@ TQString KMyMoney2App::readLastUsedDir(void) const
   TQString str;
 
   //get global config object for our app.
-  TDEConfig *kconfig = TDEGlobal::config();
-  if(kconfig)
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  if(tdeconfig)
   {
-    kconfig->setGroup("General Options");
+    tdeconfig->setGroup("General Options");
 
     //read path entry.  Second parameter is the default if the setting is not found, which will be the default document path.
-    str = kconfig->readPathEntry("LastUsedDirectory", TDEGlobalSettings::documentPath());
+    str = tdeconfig->readPathEntry("LastUsedDirectory", TDEGlobalSettings::documentPath());
     // if the path stored is empty, we use the default nevertheless
     if(str.isEmpty())
       str = TDEGlobalSettings::documentPath();
@@ -5801,13 +5801,13 @@ TQString KMyMoney2App::readLastUsedFile(void) const
   TQString str;
 
   // get global config object for our app.
-  TDEConfig *kconfig = TDEGlobal::config();
-  if(kconfig)
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  if(tdeconfig)
   {
-    kconfig->setGroup("General Options");
+    tdeconfig->setGroup("General Options");
 
     // read filename entry.
-    str = kconfig->readEntry("LastUsedFile", "");
+    str = tdeconfig->readEntry("LastUsedFile", "");
   }
 
   return str;