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

12 files changed, 35 insertions, 35 deletions

diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp
index 61e0f3b82..db0421c52 100644
--- a/konqueror/sidebar/konqsidebar.cpp
+++ b/konqueror/sidebar/konqsidebar.cpp
@@ -32,8 +32,8 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
 	// this should be your custom internal widget
 	m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() );
 	m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
-	connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
-		this, TQT_SIGNAL(started(KIO::Job*)));
+	connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)),
+		this, TQT_SIGNAL(started(TDEIO::Job*)));
 	connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed()));
 	connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)),
 		m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&)));
diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h
index ad859d025..b9225edfa 100644
--- a/konqueror/sidebar/konqsidebarplugin.h
+++ b/konqueror/sidebar/konqsidebarplugin.h
@@ -51,7 +51,7 @@ class KDE_EXPORT KonqSidebarPlugin : public TQObject
 
 	signals:
 		void requestURL(KURL&);
-		void started(KIO::Job *);
+		void started(TDEIO::Job *);
 		void completed();
 		void setIcon(const TQString& icon);
 		void setCaption(const TQString& caption);
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index f1dd6ad22..6a5ecd22d 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -130,7 +130,7 @@ void addBackEnd::doRollBack()
 		dirEntries.remove("..");
 		for ( TQStringList::Iterator it = dirEntries.begin(); it != dirEntries.end(); ++it ) {
 			if ((*it)!="add")
-				 KIO::NetAccess::del(KURL( loc+(*it) ), m_parent);
+				 TDEIO::NetAccess::del(KURL( loc+(*it) ), m_parent);
 		}
 		emit initialCopyNeeded();
 	}
@@ -303,11 +303,11 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
 
         if (universalMode)
         {
-                m_config = new KConfig("konqsidebartng_kicker.rc");
+                m_config = new TDEConfig("konqsidebartng_kicker.rc");
         }
         else
         {
-                m_config = new KConfig("konqsidebartng.rc");
+                m_config = new TDEConfig("konqsidebartng.rc");
                 m_config->setGroup(currentProfile);
         }
         readConfig();
@@ -1195,8 +1195,8 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
 
 void Sidebar_Widget::connectModule(TQObject *mod)
 {
-	if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) {
-		connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*)));
+	if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) {
+		connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*)));
 	}
 
 	if (mod->metaObject()->findSignal("completed()") != -1) {
diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h
index d258c9c3b..da5b0888b 100644
--- a/konqueror/sidebar/sidebar_widget.h
+++ b/konqueror/sidebar/sidebar_widget.h
@@ -130,7 +130,7 @@ protected slots:
 	void saveConfig();
 
 signals:
-	void started(KIO::Job *);
+	void started(TDEIO::Job *);
 	void completed();
 	void fileSelection(const KFileItemList& iems);
 	void fileMouseOver(const KFileItem& item);
@@ -191,7 +191,7 @@ private:
 	TQGuardedPtr<ButtonInfo> m_activeModule;
 	TQGuardedPtr<ButtonInfo> m_currentButton;
 	
-	KConfig *m_config;
+	TDEConfig *m_config;
 	TQTimer m_configTimer;
 	
 	KURL m_storedUrl;
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
index 16520d0e0..9c31acdf5 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
@@ -203,7 +203,7 @@ void KonqSidebarDirTreeItem::paste()
         kdDebug(1201) << "move (from clipboard data) = " << move << endl;
     }
 
-    KIO::pasteClipboard( m_fileItem->url(), move );
+    TDEIO::pasteClipboard( m_fileItem->url(), move );
 }
 
 void KonqSidebarDirTreeItem::trash()
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
index 7d8f7b1fd..40dd324e8 100644
--- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
+++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
@@ -42,7 +42,7 @@ KonqSidebarDirTreeModule::KonqSidebarDirTreeModule( KonqSidebarTree * parentTree
         universalMode = ksi ? ksi->universalMode() : false;
     } */
 
-    KConfig * config = new KConfig( universalMode ? "konqsidebartng_kicker.rc" : "konqsidebartng.rc" );
+    TDEConfig * config = new TDEConfig( universalMode ? "konqsidebartng_kicker.rc" : "konqsidebartng.rc" );
     config->setGroup("");
     m_showArchivesAsFolders = config->readBoolEntry("ShowArchivesAsFolders",true);
     delete config;
@@ -90,7 +90,7 @@ void KonqSidebarDirTreeModule::addTopLevelItem( KonqSidebarTreeTopLevelItem * it
 		TQString configured = cfg.readEntry("X-TDE-ConfiguredURL");
 		if (!configured.isEmpty()) {
 			TQStringList list = TQStringList::split(':', configured);
-			KConfig config(list[0]);
+			TDEConfig config(list[0]);
 			if (list[1] != "noGroup") config.setGroup(list[1]);
 			TQString conf_url = config.readEntry(list[2]);
 			if (!conf_url.isEmpty()) {
@@ -378,7 +378,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item )
 
           KonqSidebarDirTreeItem *dirTreeItem = new KonqSidebarDirTreeItem( parentItem, m_topLevelItem, fileItem );
           dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
-          dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+          dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
 
           oldItem = static_cast<KonqSidebarDirTreeItem *> (oldItem->nextSibling());
        }
@@ -447,7 +447,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries )
 
             KonqSidebarDirTreeItem *dirTreeItem = new KonqSidebarDirTreeItem( parentItem, m_topLevelItem, fileItem );
             dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
-            dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+            dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
         }
         
     } while ((parentItem = parentItemList ? parentItemList->take(0) : 0));
@@ -494,7 +494,7 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
 
                 dirTreeItem->reset(); // Reset id
                 dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
-                dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+                dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
 
                 // Make sure the item doesn't get inserted twice!
                 // dirTreeItem->id points to the new name
@@ -504,7 +504,7 @@ void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries )
             else
             {
                 dirTreeItem->setPixmap( 0, fileItem->pixmap( size ) );
-                dirTreeItem->setText( 0, KIO::decodeFileName( fileItem->name() ) );
+                dirTreeItem->setText( 0, TDEIO::decodeFileName( fileItem->name() ) );
             }
 
         } while ((item = itemList ? itemList->take(0) : 0));
diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp
index 71c1b5a44..30d96f060 100644
--- a/konqueror/sidebar/trees/history_module/history_module.cpp
+++ b/konqueror/sidebar/trees/history_module/history_module.cpp
@@ -56,8 +56,8 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
     m_dict.setAutoDelete( true );
     m_currentTime = TQDateTime::currentDateTime();
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     m_sortsByName = kc->readEntry( "SortHistory", "byDate" ) == "byName";
 
 
@@ -111,8 +111,8 @@ KonqSidebarHistoryModule::~KonqSidebarHistoryModule()
 	++it;
     }
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     kc->writeEntry("OpenGroups", openGroups);
     kc->sync();
 }
@@ -143,8 +143,8 @@ void KonqSidebarHistoryModule::slotCreateItems()
 	++it;
     }
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     TQStringList openGroups = kc->readListEntry("OpenGroups");
     TQStringList::Iterator it2 = openGroups.begin();
     KonqSidebarHistoryGroupItem *group;
@@ -297,8 +297,8 @@ void KonqSidebarHistoryModule::sortingChanged()
 {
     m_topLevelItem->sort();
 
-    KConfig *kc = TDEGlobal::config();
-    KConfigGroupSaver cs( kc, "HistorySettings" );
+    TDEConfig *kc = TDEGlobal::config();
+    TDEConfigGroupSaver cs( kc, "HistorySettings" );
     kc->writeEntry( "SortHistory", m_sortsByName ? "byName" : "byDate" );
     kc->sync();
 }
diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp
index 3e8c8a5de..701f72776 100644
--- a/konqueror/sidebar/trees/history_module/history_settings.cpp
+++ b/konqueror/sidebar/trees/history_module/history_settings.cpp
@@ -42,7 +42,7 @@ KonqSidebarHistorySettings::~KonqSidebarHistorySettings()
 
 void KonqSidebarHistorySettings::readSettings(bool global)
 {
-    KConfig *config;
+    TDEConfig *config;
     TQString oldgroup;
 
     if (global) {
@@ -50,7 +50,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
       oldgroup= config->group();
     }
     else
-      config = new KConfig("konquerorrc");
+      config = new TDEConfig("konquerorrc");
 
     config->setGroup("HistorySettings");
     m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
@@ -77,7 +77,7 @@ void KonqSidebarHistorySettings::readSettings(bool global)
 
 void KonqSidebarHistorySettings::applySettings()
 {
-    KConfig *config = new KConfig("konquerorrc");
+    TDEConfig *config = new TDEConfig("konquerorrc");
     config->setGroup("HistorySettings");
 
     config->writeEntry("Value youngerThan", m_valueYoungerThan );
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
index a1ef792d6..967616bd5 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp
@@ -49,7 +49,7 @@ typedef KGenericFactory<HistorySidebarConfig, TQWidget > KCMHistoryFactory;
 K_EXPORT_COMPONENT_FACTORY (kcm_history, KCMHistoryFactory("kcmhistory") )
 
 HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, const TQStringList & )
-    : KCModule (KCMHistoryFactory::instance(), parent, name)
+    : TDECModule (KCMHistoryFactory::instance(), parent, name)
 {
     TDEGlobal::locale()->insertCatalogue("konqueror");
 
@@ -115,7 +115,7 @@ void HistorySidebarConfig::configChanged()
 
 void HistorySidebarConfig::load()
 {
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("HistorySettings");
     dialog->spinExpire->setValue( config.readNumEntry( "Maximum age of History entries", 90) );
     dialog->spinEntries->setValue( config.readNumEntry( "Maximum of History entries", 500 ) );
@@ -147,7 +147,7 @@ void HistorySidebarConfig::save()
     TQ_UINT32 age   = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0;
     TQ_UINT32 count = dialog->spinEntries->value();
 
-    KConfig config("konquerorrc");
+    TDEConfig config("konquerorrc");
     config.setGroup("HistorySettings");
     config.writeEntry( "Maximum of History entries", count );
     config.writeEntry( "Maximum age of History entries", age );
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.h b/konqueror/sidebar/trees/history_module/kcmhistory.h
index 0e354af65..5731ae267 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.h
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.h
@@ -27,7 +27,7 @@ class KonqHistoryManager;
 class KonqSidebarHistorySettings;
 class KonqSidebarHistoryDlg;
 
-class HistorySidebarConfig : public KCModule
+class HistorySidebarConfig : public TDECModule
 {
   Q_OBJECT
 
diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp
index 7ba7c3014..b156c071d 100644
--- a/konqueror/sidebar/trees/konq_sidebartree.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartree.cpp
@@ -380,7 +380,7 @@ void KonqSidebarTree::addURL(KonqSidebarTreeTopLevelItem* item, const KURL & url
     {
        TQString filename = findUniqueFilename(path, url.fileName());
        destUrl.setPath(filename);
-       KIO::NetAccess::copy(url, destUrl, this);
+       TDEIO::NetAccess::copy(url, destUrl, this);
     }
     else
     {
@@ -760,7 +760,7 @@ void KonqSidebarTree::loadTopLevelItem( KonqSidebarTreeItem *parent,  const TQSt
     TQFileInfo inf( filename );
 
     TQString path = filename;
-    TQString name = KIO::decodeFileName( inf.fileName() );
+    TQString name = TDEIO::decodeFileName( inf.fileName() );
     if ( name.length() > 8 && name.right( 8 ) == ".desktop" )
         name.truncate( name.length() - 8 );
     if ( name.length() > 7 && name.right( 7 ) == ".kdelnk" )
diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
index 4ce6fe445..8c9b787f8 100644
--- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
+++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
@@ -169,7 +169,7 @@ void KonqSidebarTreeTopLevelItem::paste()
     else
         destURL = m_externalURL;
 
-    KIO::pasteClipboard( destURL, move );
+    TDEIO::pasteClipboard( destURL, move );
 }
 
 void KonqSidebarTreeTopLevelItem::rename()