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

11 files changed, 42 insertions, 42 deletions

diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index d2cd8c0..a6993ae 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -59,8 +59,8 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const
 ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name)
 {
   topWidgetName = parent->topLevelWidget()->name();
-  config = new KConfig("metabarrc");
-  iconConfig = new KConfig(locate("data", "metabar/iconsrc"));
+  config = new TDEConfig("metabarrc");
+  iconConfig = new TDEConfig(locate("data", "metabar/iconsrc"));
 
   setCaption(i18n("Configuration - Metabar"));
   setIcon(SmallIcon("metabar"));
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h
index 02f3600..3e10757 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.h
+++ b/konq-plugins/sidebar/metabar/src/configdialog.h
@@ -80,8 +80,8 @@ class ConfigDialog : public TQDialog
     
     TQPtrDict<LinkEntry> linkList;
     
-    KConfig *config;
-    KConfig *iconConfig;
+    TDEConfig *config;
+    TDEConfig *iconConfig;
     
   protected slots:
     void accept();
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index b199b58..3bcf924 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -84,10 +84,10 @@ void DefaultPlugin::loadActions(DOM::HTMLElement node)
   KFileItem *item = m_items.getFirst();
   KURL url = item->url();
   
-  KConfig config("metabarrc", true, false);
+  TDEConfig config("metabarrc", true, false);
   config.setGroup("General");
   
-  KConfig iconConfig(locate("data", "metabar/iconsrc"));
+  TDEConfig iconConfig(locate("data", "metabar/iconsrc"));
   iconConfig.setGroup("Icons");
   
   DOM::DOMString innerHTML;
@@ -170,7 +170,7 @@ void DefaultPlugin::loadApplications(DOM::HTMLElement node)
         
         offers = KTrader::self()->query(item->mimetype(), "Type == 'Application'");
         if(!offers.isEmpty()){
-          KConfig config("metabarrc", true, false);
+          TDEConfig config("metabarrc", true, false);
           config.setGroup("General");
         
           int id = 0;
@@ -219,7 +219,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
     innerHTML += "<ul class=\"info\"><b>" + i18n("Type") + ": </b>";
     innerHTML += that->determineMimeType()->comment();
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Size") + ": </b>";
-    innerHTML += KIO::convertSize(item->size());
+    innerHTML += TDEIO::convertSize(item->size());
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("User") + ": </b>";
     innerHTML += item->user();
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Group") + ": </b>";
@@ -227,9 +227,9 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Permissions") + ": </b>";
     innerHTML += (item->permissionsString());
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Modified") + ": </b>";
-    innerHTML += item->timeString(KIO::UDS_MODIFICATION_TIME);
+    innerHTML += item->timeString(TDEIO::UDS_MODIFICATION_TIME);
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Accessed") + ": </b>";
-    innerHTML += item->timeString(KIO::UDS_ACCESS_TIME);
+    innerHTML += item->timeString(TDEIO::UDS_ACCESS_TIME);
     innerHTML += "</ul>";
         
     if(item->isLink()){
@@ -275,7 +275,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
     node.setInnerHTML(innerHTML);
   }
   else{
-    KIO::filesize_t size = 0;
+    TDEIO::filesize_t size = 0;
     int files = 0;
     int dirs  = 0;
     
@@ -292,7 +292,7 @@ void DefaultPlugin::loadInformation(DOM::HTMLElement node)
  
     DOM::DOMString innerHTML;
     innerHTML += "<ul class=\"info\"><b>" + i18n("Size") + ": </b>";
-    innerHTML += KIO::convertSize(size);
+    innerHTML += TDEIO::convertSize(size);
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Files") + ": </b>";
     innerHTML += TQString(TQString().setNum(files));
     innerHTML += "</ul><ul class=\"info\"><b>" + i18n("Folders") + ": </b>";
@@ -334,11 +334,11 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node)
         
         //m_functions->show("preview");
       
-        preview_job = KIO::filePreview(KURL::List(url), m_html->view()->width() - 30);
+        preview_job = TDEIO::filePreview(KURL::List(url), m_html->view()->width() - 30);
           
         connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&)));
         connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *)));
-        connect(preview_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *)));
+        connect(preview_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
       }
       
       m_functions->show("preview");
@@ -404,7 +404,7 @@ void DefaultPlugin::slotPreviewFailed(const KFileItem *item)
   m_functions->hide("preview");
 }
 
-void DefaultPlugin::slotJobFinished(KIO::Job *job)
+void DefaultPlugin::slotJobFinished(TDEIO::Job *job)
 {
   if(preview_job && job == preview_job){
     preview_job = 0;
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h
index 4df0ae0..b86b12e 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.h
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h
@@ -52,14 +52,14 @@ class DefaultPlugin : public ProtocolPlugin
       
   private:
     TQMap<int,KService::Ptr> runMap;
-    KIO::PreviewJob *preview_job;
+    TDEIO::PreviewJob *preview_job;
     
     ServiceLoader *services;
     
   private slots:
     void slotSetPreview(const KFileItem*, const TQPixmap&);
     void slotPreviewFailed(const KFileItem *item);
-    void slotJobFinished(KIO::Job *item);
+    void slotJobFinished(TDEIO::Job *item);
 };
 
 #endif
diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
index 1aaf9e8..adf316c 100644
--- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp
@@ -95,7 +95,7 @@ void MetabarFunctions::toggle(DOM::DOMString item)
     DOM::DOMString att = isExpanded ? "false" : "true";
     node.setAttribute("expanded", att);
     
-    KConfig config("metabarrc");
+    TDEConfig config("metabarrc");
     config.setGroup("General");
     
     if(config.readBoolEntry("AnimateResize", false)){
@@ -126,7 +126,7 @@ void MetabarFunctions::adjustSize(DOM::DOMString item)
     if(isExpanded){
       int height = getHeight(node);
       
-      KConfig config("metabarrc");
+      TDEConfig config("metabarrc");
       config.setGroup("General");
     
       if(config.readBoolEntry("AnimateResize", false)){
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 9fe8c86..50749eb 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -81,7 +81,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   currentItems = new KFileItemList;
   currentItems->setAutoDelete(true);
   
-  config = new KConfig("metabarrc");
+  config = new TDEConfig("metabarrc");
   
   dir_watch = new KDirWatch();
   connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&)));
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h
index 9874c29..bf9c7ad 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.h
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h
@@ -51,7 +51,7 @@ class MetabarWidget : public TQWidget
     
   private:
     KFileItemList *currentItems;
-    KConfig *config;
+    TDEConfig *config;
 
     KHTMLPart *html;
     
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 8daf5ba..38d0bba 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -112,13 +112,13 @@ void ProtocolPlugin::setFileItems(const KFileItemList &items)
   }
 
   if(!size.isNull()){
-    KIO::filesize_t s = 0;
+    TDEIO::filesize_t s = 0;
     
     for(KFileItemListIterator it(m_items); it.current(); ++it){
       s += (*it)->size();
     }
 
-    size.setInnerText(KIO::convertSize(s));
+    size.setInnerText(TDEIO::convertSize(s));
   }
   
   if(!actions.isNull()){
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index fd8c02b..af04017 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -58,7 +58,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
   urlList.append(url);
   
   TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "konqueror/servicemenus/" );
-  KConfig config("metabarrc", true, false);
+  TDEConfig config("metabarrc", true, false);
   config.setGroup("General");
   int maxActions = config.readNumEntry("MaxActions");
   bool matchAll = false; // config.readBoolEntry("MatchAll");
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 76853c6..95c5119 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -57,9 +57,9 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
   KURL url = m_items.getFirst()->url();
   
   if(url.path().endsWith("/")){
-    list_job = KIO::listDir(url, true, false);
-    connect(list_job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(KIO::Job *, const KIO::UDSEntryList &)));
-    connect(list_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobFinished(KIO::Job *)));
+    list_job = TDEIO::listDir(url, true, false);
+    connect(list_job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
+    connect(list_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *)));
   
     m_functions->show("actions");
   }
@@ -69,7 +69,7 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node)
     
     KService::Ptr service = KService::serviceByStorageId(name);
     if(service && service->isValid()){
-      KCModuleInfo kcminfo(service);
+      TDECModuleInfo kcminfo(service);
       
       DOM::DOMString innerHTML;      
       MetabarWidget::addEntry(innerHTML, i18n("Run"), "kcmshell:/" + name, kcminfo.icon());
@@ -95,7 +95,7 @@ void SettingsPlugin::loadInformation(DOM::HTMLElement node)
     
     KService::Ptr service = KService::serviceByStorageId(name);
     if(service && service->isValid()){
-      KCModuleInfo kcminfo(service);
+      TDECModuleInfo kcminfo(service);
       
       bool needsRoot = kcminfo.needsRootPrivileges();
     
@@ -141,7 +141,7 @@ bool SettingsPlugin::handleRequest(const KURL &)
   return false;
 }
 
-void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list)
+void SettingsPlugin::slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list)
 {
   if(!job){
     return;
@@ -151,28 +151,28 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
   DOM::HTMLElement node = doc.getElementById("actions");
   DOM::DOMString innerHTML;
   
-  KIO::UDSEntryList::ConstIterator it     = list.begin();
-  KIO::UDSEntryList::ConstIterator it_end = list.end();
+  TDEIO::UDSEntryList::ConstIterator it     = list.begin();
+  TDEIO::UDSEntryList::ConstIterator it_end = list.end();
   for(; it != it_end; ++it){
     TQString name;
     TQString icon;
     TQString url;
     long type;
   
-    KIO::UDSEntry::ConstIterator atomit     = (*it).begin();
-    KIO::UDSEntry::ConstIterator atomit_end = (*it).end();
+    TDEIO::UDSEntry::ConstIterator atomit     = (*it).begin();
+    TDEIO::UDSEntry::ConstIterator atomit_end = (*it).end();
     for(; atomit != atomit_end; ++atomit){
-      if((*atomit).m_uds == KIO::UDS_NAME){
+      if((*atomit).m_uds == TDEIO::UDS_NAME){
         name = (*atomit).m_str;
       }
-      else if((*atomit).m_uds == KIO::UDS_ICON_NAME){
+      else if((*atomit).m_uds == TDEIO::UDS_ICON_NAME){
         icon = (*atomit).m_str;
       }
-      else if((*atomit).m_uds == KIO::UDS_URL){
+      else if((*atomit).m_uds == TDEIO::UDS_URL){
         url = (*atomit).m_str;
       }
       
-      else if((*atomit).m_uds == KIO::UDS_FILE_TYPE){
+      else if((*atomit).m_uds == TDEIO::UDS_FILE_TYPE){
         type = (*atomit).m_long;
       }
     }
@@ -189,7 +189,7 @@ void SettingsPlugin::slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list
   node.setInnerHTML(innerHTML);
 }
 
-void SettingsPlugin::slotJobFinished(KIO::Job *job)
+void SettingsPlugin::slotJobFinished(TDEIO::Job *job)
 {
   if(list_job && job == list_job){
     list_job = 0;
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h
index 609be74..c8580de 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.h
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h
@@ -47,11 +47,11 @@ class SettingsPlugin : public ProtocolPlugin
     void loadBookmarks(DOM::HTMLElement node);
     
   private:
-    KIO::ListJob *list_job;
+    TDEIO::ListJob *list_job;
     
   private slots:
-    void slotGotEntries(KIO::Job *job, const KIO::UDSEntryList &list);
-    void slotJobFinished(KIO::Job *job);
+    void slotGotEntries(TDEIO::Job *job, const TDEIO::UDSEntryList &list);
+    void slotJobFinished(TDEIO::Job *job);
 };
 
 #endif