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

1 files changed, 11 insertions, 11 deletions

diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp
index 7888987..5aa61cd 100644
--- a/src/fetch/fetchmanager.cpp
+++ b/src/fetch/fetchmanager.cpp
@@ -93,9 +93,9 @@ void Manager::loadFetchers() {
   m_fetchers.clear();
   m_configMap.clear();
 
-  KConfig* config = TDEGlobal::config();
+  TDEConfig* config = TDEGlobal::config();
   if(config->hasGroup(TQString::fromLatin1("Data Sources"))) {
-    KConfigGroup configGroup(config, TQString::fromLatin1("Data Sources"));
+    TDEConfigGroup configGroup(config, TQString::fromLatin1("Data Sources"));
     int nSources = configGroup.readNumEntry("Sources Count", 0);
     for(int i = 0; i < nSources; ++i) {
       TQString group = TQString::fromLatin1("Data Source %1").arg(i);
@@ -235,13 +235,13 @@ bool Manager::canFetch() const {
   return false;
 }
 
-Tellico::Fetch::Fetcher::Ptr Manager::createFetcher(KConfig* config_, const TQString& group_) {
+Tellico::Fetch::Fetcher::Ptr Manager::createFetcher(TDEConfig* config_, const TQString& group_) {
   if(!config_->hasGroup(group_)) {
     myDebug() << "Manager::createFetcher() - no config group for " << group_ << endl;
     return 0;
   }
 
-  KConfigGroup config(config_, group_);
+  TDEConfigGroup config(config_, group_);
 
   int fetchType = config.readNumEntry("Type", Fetch::Unknown);
   if(fetchType == Fetch::Unknown) {
@@ -371,11 +371,11 @@ Tellico::Fetch::FetcherVec Manager::createUpdateFetchers(int collType_) {
   }
 
   FetcherVec vec;
-  KConfigGroup config(TDEGlobal::config(), "Data Sources");
+  TDEConfigGroup config(TDEGlobal::config(), "Data Sources");
   int nSources = config.readNumEntry("Sources Count", 0);
   for(int i = 0; i < nSources; ++i) {
     TQString group = TQString::fromLatin1("Data Source %1").arg(i);
-    // needs the KConfig*
+    // needs the TDEConfig*
     Fetcher::Ptr f = createFetcher(TDEGlobal::config(), group);
     if(f && f->canFetch(collType_) && f->canUpdate()) {
       vec.append(f);
@@ -443,7 +443,7 @@ Tellico::Fetch::TypePairList Manager::typeList() {
   TQStringList files = TDEGlobal::dirs()->findAllResources("appdata", TQString::fromLatin1("data-sources/*.spec"),
                                                         false, true);
   for(TQStringList::Iterator it = files.begin(); it != files.end(); ++it) {
-    KConfig spec(*it, false, false);
+    TDEConfig spec(*it, false, false);
     TQString name = spec.readEntry("Name");
     if(name.isEmpty()) {
       myDebug() << "Fetch::Manager::typeList() - no Name for " << *it << endl;
@@ -499,10 +499,10 @@ Tellico::Fetch::ConfigWidget* Manager::configWidget(TQWidget* parent_, Type type
         from.setPath(m_scriptMap[name_]);
         to.setPath(tmpFile.name());
         // have to overwrite since KTempFile already created it
-        if(!KIO::NetAccess::file_copy(from, to, -1, true /*overwrite*/)) {
-          myDebug() << KIO::NetAccess::lastErrorString() << endl;
+        if(!TDEIO::NetAccess::file_copy(from, to, -1, true /*overwrite*/)) {
+          myDebug() << TDEIO::NetAccess::lastErrorString() << endl;
         }
-        KConfig spec(to.path(), false, false);
+        TDEConfig spec(to.path(), false, false);
         // pass actual location of spec file
         if(name_ == spec.readEntry("Name") && bundledScriptHasExecPath(m_scriptMap[name_], &spec)) {
           static_cast<ExecExternalFetcher::ConfigWidget*>(w)->readConfig(&spec);
@@ -677,7 +677,7 @@ TQString Manager::favIcon(const KURL& url_) {
   return KMimeType::iconForURL(url_);
 }
 
-bool Manager::bundledScriptHasExecPath(const TQString& specFile_, KConfig* config_) {
+bool Manager::bundledScriptHasExecPath(const TQString& specFile_, TDEConfig* config_) {
   // make sure ExecPath is set and executable
   // for the bundled scripts, either the exec name is not set, in which case it is the
   // name of the spec file, minus the .spec, or the exec is set, and is local to the dir