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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b5e2a4b..18d7738 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -776,7 +776,7 @@ void MainWindow::initDocument() {
   MARK;
   Data::Document* doc = Data::Document::self();
 
-  KConfigGroup config(TDEGlobal::config(), "General Options");
+  TDEConfigGroup config(TDEGlobal::config(), "General Options");
   doc->setLoadAllImages(config.readBoolEntry("Load All Images", false));
 
   // allow status messages from the document
@@ -924,7 +924,7 @@ void MainWindow::saveOptions() {
 }
 
 void MainWindow::readCollectionOptions(Data::CollPtr coll_) {
-  KConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName()));
+  TDEConfigGroup group(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName()));
 
   TQString defaultGroup = coll_->defaultGroupField();
   TQString entryGroup;
@@ -966,7 +966,7 @@ void MainWindow::saveCollectionOptions(Data::CollPtr coll_) {
   }
 
   int configIndex = -1;
-  KConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName()));
+  TDEConfigGroup config(TDEGlobal::config(), TQString::fromLatin1("Options - %1").arg(coll_->typeName()));
   TQString groupName;
   if(m_entryGrouping->currentItem() > -1 &&
      static_cast<int>(coll_->entryGroups().count()) > m_entryGrouping->currentItem()) {
@@ -1047,7 +1047,7 @@ void MainWindow::readOptions() {
   // Put them in init()
 }
 
-void MainWindow::saveProperties(KConfig* cfg_) {
+void MainWindow::saveProperties(TDEConfig* cfg_) {
   if(!isNewDocument() && !Data::Document::self()->isModified()) {
     // saving to tempfile not necessary
   } else {
@@ -1061,7 +1061,7 @@ void MainWindow::saveProperties(KConfig* cfg_) {
   }
 }
 
-void MainWindow::readProperties(KConfig* cfg_) {
+void MainWindow::readProperties(TDEConfig* cfg_) {
   TQString filename = cfg_->readEntry(TQString::fromLatin1("filename"));
   bool modified = cfg_->readBoolEntry(TQString::fromLatin1("modified"), false);
   if(modified) {
@@ -1908,7 +1908,7 @@ void MainWindow::slotFileImport(int format_) {
   }
 
   if(checkURL) {
-    bool ok = !url.isEmpty() && url.isValid() && KIO::NetAccess::exists(url, true, this);
+    bool ok = !url.isEmpty() && url.isValid() && TDEIO::NetAccess::exists(url, true, this);
     if(!ok) {
       StatusBar::self()->clearStatus();
       return;
@@ -2062,7 +2062,7 @@ bool MainWindow::importFile(Import::Format format_, const KURL& url_, Import::Ac
 
   bool failed = false;
   Data::CollPtr coll;
-  if(!url_.isEmpty() && url_.isValid() && KIO::NetAccess::exists(url_, true, this)) {
+  if(!url_.isEmpty() && url_.isValid() && TDEIO::NetAccess::exists(url_, true, this)) {
     coll = ImportDialog::importURL(format_, url_);
   } else {
     Kernel::self()->sorry(i18n(errorLoad).arg(url_.fileName()));