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

6 files changed, 45 insertions, 45 deletions

diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index 4211ed9..d617bb0 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -33,7 +33,7 @@ email                : mte@users.sourceforge.net
 // KDE Includes
 #ifndef _GNCFILEANON
   #include <klocale.h>
-  #include <kconfig.h>
+  #include <tdeconfig.h>
   #include <kmessagebox.h>
 #endif
 
diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
index d65a384..a40685f 100644
--- a/kmymoney2/converter/mymoneyqifprofile.cpp
+++ b/kmymoney2/converter/mymoneyqifprofile.cpp
@@ -25,7 +25,7 @@
 // KDE Includes
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kcalendarsystem.h>
 
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 2e7266b..33c844b 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -38,11 +38,11 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kprogress.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // ----------------------------------------------------------------------------
 // Project Headers
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index 8bef60e..87fa409 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -36,7 +36,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tqvbox.h>
diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp
index 191474f..721e96a 100644
--- a/kmymoney2/converter/mymoneytemplate.cpp
+++ b/kmymoney2/converter/mymoneytemplate.cpp
@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ksavefile.h>
 
 // ----------------------------------------------------------------------------
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index b614dcc..14db612 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/kmymoney2/converter/webpricequote.cpp
@@ -26,13 +26,13 @@
 // ----------------------------------------------------------------------------
 // KDE Headers
 
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
 #include <kurl.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kcalendarsystem.h>
@@ -598,8 +598,8 @@ TQStringList WebPriceQuote::quoteSources (const _quoteSystemE _system) {
 
 TQStringList WebPriceQuote::quoteSourcesNative()
 {
-  TDEConfig *kconfig = TDEGlobal::config();
-  TQStringList groups = kconfig->groupList();
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  TQStringList groups = tdeconfig->groupList();
 
   TQStringList::Iterator it;
   TQRegExp onlineQuoteSource(TQString("^Online-Quote-Source-(.*)$"));
@@ -614,23 +614,23 @@ TQStringList WebPriceQuote::quoteSourcesNative()
 
   // if the user has the OLD quote source defined, now is the
   // time to remove that entry and convert it to the new system.
-  if ( ! groups.count() && kconfig->hasGroup("Online Quotes Options") )
+  if ( ! groups.count() && tdeconfig->hasGroup("Online Quotes Options") )
   {
-    kconfig->setGroup("Online Quotes Options");
-    TQString url(kconfig->readEntry("URL","http://finance.yahoo.com/d/quotes.csv?s=%1&f=sl1d1"));
-    TQString symbolRegExp(kconfig->readEntry("SymbolRegex","\"([^,\"]*)\",.*"));
-    TQString priceRegExp(kconfig->readEntry("PriceRegex","[^,]*,([^,]*),.*"));
-    TQString dateRegExp(kconfig->readEntry("DateRegex","[^,]*,[^,]*,\"([^\"]*)\""));
-    kconfig->deleteGroup("Online Quotes Options");
+    tdeconfig->setGroup("Online Quotes Options");
+    TQString url(tdeconfig->readEntry("URL","http://finance.yahoo.com/d/quotes.csv?s=%1&f=sl1d1"));
+    TQString symbolRegExp(tdeconfig->readEntry("SymbolRegex","\"([^,\"]*)\",.*"));
+    TQString priceRegExp(tdeconfig->readEntry("PriceRegex","[^,]*,([^,]*),.*"));
+    TQString dateRegExp(tdeconfig->readEntry("DateRegex","[^,]*,[^,]*,\"([^\"]*)\""));
+    tdeconfig->deleteGroup("Online Quotes Options");
 
     groups += "Old Source";
-    kconfig->setGroup(TQString("Online-Quote-Source-%1").arg("Old Source"));
-    kconfig->writeEntry("URL", url);
-    kconfig->writeEntry("SymbolRegex", symbolRegExp);
-    kconfig->writeEntry("PriceRegex",priceRegExp);
-    kconfig->writeEntry("DateRegex", dateRegExp);
-    kconfig->writeEntry("DateFormatRegex", "%m %d %y");
-    kconfig->sync();
+    tdeconfig->setGroup(TQString("Online-Quote-Source-%1").arg("Old Source"));
+    tdeconfig->writeEntry("URL", url);
+    tdeconfig->writeEntry("SymbolRegex", symbolRegExp);
+    tdeconfig->writeEntry("PriceRegex",priceRegExp);
+    tdeconfig->writeEntry("DateRegex", dateRegExp);
+    tdeconfig->writeEntry("DateFormatRegex", "%m %d %y");
+    tdeconfig->sync();
   }
 
   // Set up each of the default sources.  These are done piecemeal so that
@@ -643,7 +643,7 @@ TQStringList WebPriceQuote::quoteSourcesNative()
     {
       groups += (*it_source).m_name;
       (*it_source).write();
-      kconfig->sync();
+      tdeconfig->sync();
     }
     ++it_source;
   }
@@ -683,29 +683,29 @@ WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name, const TQString& u
 WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name)
 {
   m_name = name;
-  TDEConfig *kconfig = TDEGlobal::config();
-  kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name));
-  m_sym = kconfig->readEntry("SymbolRegex");
-  m_date = kconfig->readEntry("DateRegex");
-  m_dateformat = kconfig->readEntry("DateFormatRegex","%m %d %y");
-  m_price = kconfig->readEntry("PriceRegex");
-  m_url = kconfig->readEntry("URL");
-  m_skipStripping = kconfig->readBoolEntry("SkipStripping", false);
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  tdeconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name));
+  m_sym = tdeconfig->readEntry("SymbolRegex");
+  m_date = tdeconfig->readEntry("DateRegex");
+  m_dateformat = tdeconfig->readEntry("DateFormatRegex","%m %d %y");
+  m_price = tdeconfig->readEntry("PriceRegex");
+  m_url = tdeconfig->readEntry("URL");
+  m_skipStripping = tdeconfig->readBoolEntry("SkipStripping", false);
 }
 
 void WebPriceQuoteSource::write(void) const
 {
-  TDEConfig *kconfig = TDEGlobal::config();
-  kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name));
-  kconfig->writeEntry("URL", m_url);
-  kconfig->writeEntry("PriceRegex", m_price);
-  kconfig->writeEntry("DateRegex", m_date);
-  kconfig->writeEntry("DateFormatRegex", m_dateformat);
-  kconfig->writeEntry("SymbolRegex", m_sym);
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  tdeconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name));
+  tdeconfig->writeEntry("URL", m_url);
+  tdeconfig->writeEntry("PriceRegex", m_price);
+  tdeconfig->writeEntry("DateRegex", m_date);
+  tdeconfig->writeEntry("DateFormatRegex", m_dateformat);
+  tdeconfig->writeEntry("SymbolRegex", m_sym);
   if(m_skipStripping)
-    kconfig->writeEntry("SkipStripping", m_skipStripping);
+    tdeconfig->writeEntry("SkipStripping", m_skipStripping);
   else
-    kconfig->deleteEntry("SkipStripping");
+    tdeconfig->deleteEntry("SkipStripping");
 }
 
 void WebPriceQuoteSource::rename(const TQString& name)
@@ -717,8 +717,8 @@ void WebPriceQuoteSource::rename(const TQString& name)
 
 void WebPriceQuoteSource::remove(void) const
 {
-  TDEConfig *kconfig = TDEGlobal::config();
-  kconfig->deleteGroup(TQString("Online-Quote-Source-%1").arg(m_name));
+  TDEConfig *tdeconfig = TDEGlobal::config();
+  tdeconfig->deleteGroup(TQString("Online-Quote-Source-%1").arg(m_name));
 }
 
 //