From 6078e14f28ec3b34cc2041cbd8628a1d8420512c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 25 Jan 2013 00:08:33 -0600
Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid
 conflicts with KDE4

---
 kmymoney2/views/kmymoneyview.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kmymoney2/views/kmymoneyview.cpp')

diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp
index a6c8f34..1a4136c 100644
--- a/kmymoney2/views/kmymoneyview.cpp
+++ b/kmymoney2/views/kmymoneyview.cpp
@@ -581,10 +581,10 @@ bool KMyMoneyView::readFile(const KURL& url)
     filename = url.path();
 
   } else {
-    if(!KIO::NetAccess::download(url, filename, NULL)) {
+    if(!TDEIO::NetAccess::download(url, filename, NULL)) {
       KMessageBox::detailedError(this,
              i18n("Error while loading file '%1'!").arg(url.url()),
-             KIO::NetAccess::lastErrorString(),
+             TDEIO::NetAccess::lastErrorString(),
              i18n("File access error"));
       return false;
     }
@@ -771,7 +771,7 @@ bool KMyMoneyView::readFile(const KURL& url)
   // if a temporary file was constructed by NetAccess::download,
   // then it will be removed with the next call. Otherwise, it
   // stays untouched on the local filesystem
-  KIO::NetAccess::removeTempFile(filename);
+  TDEIO::NetAccess::removeTempFile(filename);
   return initializeStorage();
 }
 
@@ -890,7 +890,7 @@ bool KMyMoneyView::initializeStorage()
     selectBaseCurrency();
   }
 
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   int page;
   config->setGroup("General Options");
   if(KMyMoneyGlobalSettings::startLastViewSelected() != 0) {
@@ -1154,7 +1154,7 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList)
     } else {
       KTempFile tmpfile;
       saveToLocalFile(tmpfile.file(), pWriter, plaintext, keyList);
-      if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL))
+      if(!TDEIO::NetAccess::upload(tmpfile.name(), url, NULL))
         throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url()));
       tmpfile.unlink();
     }
@@ -1630,7 +1630,7 @@ void KMyMoneyView::progressCallback(int current, int total, const TQString& msg)
 
 void KMyMoneyView::slotRememberPage(TQWidget* w)
 {
-  KConfig *config = TDEGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   config->setGroup("Last Use Settings");
   config->writeEntry("LastViewSelected", pageIndex(w));
   config->sync();
-- 
cgit v1.2.1