Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

1 files changed, 12 insertions, 12 deletions

diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 0bd0d2a..4c0b456 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -951,9 +951,9 @@ void KMyMoney2App::slotFileOpenRecent(const KURL& url)
   if(!duplicate) {
 
 #if KDE_IS_VERSION(3,2,0)
-    if((url.protocol() == "sql") || (url.isValid() && KIO::NetAccess::exists(url, true, this))) {
+    if((url.protocol() == "sql") || (url.isValid() && TDEIO::NetAccess::exists(url, true, this))) {
 #else
-    if((url.protocol() == "sql") || (url.isValid() && KIO::NetAccess::exists(url))) {
+    if((url.protocol() == "sql") || (url.isValid() && TDEIO::NetAccess::exists(url))) {
 #endif
       KURL dburl = url;
       // check if a password is needed. it may be if the URL came from the last/recent file list
@@ -1791,7 +1791,7 @@ bool KMyMoney2App::okToWriteFile(const KURL& url)
   // check if the file exists and warn the user
   bool reallySaveFile = true;
 
-  if(KIO::NetAccess::exists(url, true, this)) {
+  if(TDEIO::NetAccess::exists(url, true, this)) {
     if(KMessageBox::warningYesNo(this, TQString("<qt>")+i18n("The file <b>%1</b> already exists. Do you really want to override it?").arg(url.prettyURL(0, KURL::StripFileProtocol))+TQString("</qt>"), i18n("File already exists")) != KMessageBox::Yes)
       reallySaveFile = false;
   }
@@ -1801,11 +1801,11 @@ bool KMyMoney2App::okToWriteFile(const KURL& url)
 void KMyMoney2App::slotSettings(void)
 {
   // if we already have an instance of the settings dialog, then use it
-  if(KConfigDialog::showDialog("KMyMoney-Settings"))
+  if(TDEConfigDialog::showDialog("KMyMoney-Settings"))
     return;
 
   // otherwise, we have to create it
-  KConfigDialog* dlg = new KConfigDialog(this, "KMyMoney-Settings", KMyMoneyGlobalSettings::self(),
+  TDEConfigDialog* dlg = new TDEConfigDialog(this, "KMyMoney-Settings", KMyMoneyGlobalSettings::self(),
     KDialogBase::IconList, KDialogBase::Default | KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, true);
 
   // create the pages ...
@@ -2408,7 +2408,7 @@ 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.
-    KConfig *kconfig = TDEGlobal::config();
+    TDEConfig *kconfig = TDEGlobal::config();
     if(kconfig) {
       kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
       kconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories"));
@@ -2582,7 +2582,7 @@ 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.
-    KConfig *kconfig = TDEGlobal::config();
+    TDEConfig *kconfig = TDEGlobal::config();
     if(kconfig) {
       kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
       kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment"));
@@ -3777,7 +3777,7 @@ 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.
-      KConfig *kconfig = TDEGlobal::config();
+      TDEConfig *kconfig = TDEGlobal::config();
       if(kconfig) {
         kconfig->setGroup(TQString::fromLatin1("Notification Messages"));
         kconfig->deleteEntry(dontAskAgain);
@@ -5751,7 +5751,7 @@ void KMyMoney2App::slotCheckSchedules(void)
 void KMyMoney2App::writeLastUsedDir(const TQString& directory)
 {
   //get global config object for our app.
-  KConfig *kconfig = TDEGlobal::config();
+  TDEConfig *kconfig = TDEGlobal::config();
   if(kconfig)
   {
     kconfig->setGroup("General Options");
@@ -5764,7 +5764,7 @@ void KMyMoney2App::writeLastUsedDir(const TQString& directory)
 void KMyMoney2App::writeLastUsedFile(const TQString& fileName)
 {
   //get global config object for our app.
-  KConfig *kconfig = TDEGlobal::config();
+  TDEConfig *kconfig = TDEGlobal::config();
   if(kconfig)
   {
     kconfig->setGroup("General Options");
@@ -5781,7 +5781,7 @@ TQString KMyMoney2App::readLastUsedDir(void) const
   TQString str;
 
   //get global config object for our app.
-  KConfig *kconfig = TDEGlobal::config();
+  TDEConfig *kconfig = TDEGlobal::config();
   if(kconfig)
   {
     kconfig->setGroup("General Options");
@@ -5801,7 +5801,7 @@ TQString KMyMoney2App::readLastUsedFile(void) const
   TQString str;
 
   // get global config object for our app.
-  KConfig *kconfig = TDEGlobal::config();
+  TDEConfig *kconfig = TDEGlobal::config();
   if(kconfig)
   {
     kconfig->setGroup("General Options");