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

17 files changed, 35 insertions, 35 deletions

diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index 1bdab489..739c6126 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cc
@@ -108,7 +108,7 @@ TQStringList KoGlobal::_listOfLanguages()
 
 void KoGlobal::createListOfLanguages()
 {
-    KConfig config( "all_languages", true, false, "locale" );
+    TDEConfig config( "all_languages", true, false, "locale" );
     // Note that we could also use KLocale::allLanguagesTwoAlpha
 
     TQMap<TQString, bool> seenLanguages;
@@ -185,10 +185,10 @@ TQString KoGlobal::languageFromTag( const TQString &langTag )
     return langTag;
 }
 
-KConfig* KoGlobal::_kofficeConfig()
+TDEConfig* KoGlobal::_kofficeConfig()
 {
     if ( !m_kofficeConfig ) {
-        m_kofficeConfig = new KConfig( "kofficerc" );
+        m_kofficeConfig = new TDEConfig( "kofficerc" );
     }
     return m_kofficeConfig;
 }
diff --git a/kexi/3rdparty/kolibs/koGlobal.h b/kexi/3rdparty/kolibs/koGlobal.h
index cad645b4..15523b3e 100644
--- a/kexi/3rdparty/kolibs/koGlobal.h
+++ b/kexi/3rdparty/kolibs/koGlobal.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqfont.h>
 #include <tqmap.h>
-class KConfig;
+class TDEConfig;
 
 #include <koffice_export.h>
 class KOFFICECORE_EXPORT KoGlobal
@@ -46,12 +46,12 @@ public:
     }
 
     /**
-     * @return the global KConfig object around kofficerc.
+     * @return the global TDEConfig object around kofficerc.
      * kofficerc is used for KOffice-wide settings, from totally unrelated classes,
-     * so this is the centralization of the KConfig object so that the file is
+     * so this is the centralization of the TDEConfig object so that the file is
      * parsed only once
      */
-    static KConfig* kofficeConfig() {
+    static TDEConfig* kofficeConfig() {
         return self()->_kofficeConfig();
     }
 
@@ -87,13 +87,13 @@ private:
     TQFont _defaultFont();
     TQStringList _listOfLanguages();
     TQStringList _listOfLanguageTags();
-    KConfig* _kofficeConfig();
+    TDEConfig* _kofficeConfig();
     void createListOfLanguages();
 
     int m_pointSize;
     typedef TQMap<TQString, TQString> LanguageMap;
     LanguageMap m_langMap; // display-name -> language tag
-    KConfig* m_kofficeConfig;
+    TDEConfig* m_kofficeConfig;
     int m_dpiX;
     int m_dpiY;
     // No BC problem here, constructor is private, feel free to add members
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp
index 1969caf5..dbea9737 100644
--- a/kexi/core/kexidbshortcutfile.cpp
+++ b/kexi/core/kexidbshortcutfile.cpp
@@ -62,7 +62,7 @@ KexiDBShortcutFile::~KexiDBShortcutFile()
 
 bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _groupKey)
 {
-	KConfig config(d->fileName, true /* readOnly */, false /* local */ );
+	TDEConfig config(d->fileName, true /* readOnly */, false /* local */ );
 	config.setGroup("File Information");
 	data.formatVersion = config.readNumEntry("version", KexiDBShortcutFile_version);
 
@@ -158,7 +158,7 @@ bool KexiDBShortcutFile::loadProjectData(KexiProjectData& data, TQString* _group
 bool KexiDBShortcutFile::saveProjectData(const KexiProjectData& data, 
 	bool savePassword, TQString* _groupKey, bool overwriteFirstGroup)
 {
-	KConfig config(d->fileName, false /*rw*/, false /* local */);
+	TDEConfig config(d->fileName, false /*rw*/, false /* local */);
 	config.setGroup("File Information");
 
 	uint realFormatVersion = data.formatVersion;
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index d651f8d0..1247c9c0 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -58,7 +58,7 @@ Manager::lookup()
 	KTrader::OfferList tlist = KTrader::self()->query("Kexi/Handler", 
 		"[X-Kexi-PartVersion] == " + TQString::number(KEXI_PART_VERSION));
 	
-	KConfig conf("kexirc", true);
+	TDEConfig conf("kexirc", true);
 	conf.setGroup("Parts");
 	TQStringList sl_order = TQStringList::split( ",", conf.readEntry("Order") );//we'll set parts in defined order
 	const int size = TQMAX( tlist.count(), sl_order.count() );
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index 0defda8c..f8708b33 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -74,7 +74,7 @@ KexiTemplateInfo KexiTemplateLoader::loadInfo(const TQString& directory)
 	}
 	if (!TQFileInfo(directory+"/info.txt").isReadable())
 		return KexiTemplateInfo();
-	KConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/);
+	TDEConfig infoTxt(directory+"/info.txt", true/*readonly*/, false/*local*/);
 	KexiTemplateInfo info;
 	info.name = infoTxt.readEntry("Name");
 	if (info.name.isEmpty()) {
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index f66e4e08..4a07191d 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -449,7 +449,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem
 - enlarge the default main window size, currently it's ~50% ofthe desktop size 
   - not convenient as user is forced to enlarge the window by hand (settings are stored though)
 - add "File->Save All" action
-- add settings dialog, KConfigXT based simple version 
+- add settings dialog, TDEConfigXT based simple version 
    + about:config-like using kconfigeditor http://extragear.kde.org/apps/kconfigeditor/
      (possible reuse of koproperty)
 
diff --git a/kexi/doc/dev/auto_update_service.txt b/kexi/doc/dev/auto_update_service.txt
index d832a5cf..eb331218 100644
--- a/kexi/doc/dev/auto_update_service.txt
+++ b/kexi/doc/dev/auto_update_service.txt
@@ -23,7 +23,7 @@ Notes:
   - First: qt-only that is used to initialize the process and check the system, independently 
 		from existing KDE sybsystem. 
 	- Second: used when we already know we already have a working KDE subsystem. This part can use 
-		KConfig, KLibLoader, etc. to change the KDE settings.
+		TDEConfig, KLibLoader, etc. to change the KDE settings.
 - To be able to do this, KDE needs get more guidelines for distributors of its binaries.
 - To be usable for commercial use, there should be one packaging system for KDE 
 	(maybe on top of tgz/rpm/deb/win32/mac?), "Meta Packaging".
diff --git a/kexi/kexidb/dbproperties.h b/kexi/kexidb/dbproperties.h
index d4b193fa..d598ce12 100644
--- a/kexi/kexidb/dbproperties.h
+++ b/kexi/kexidb/dbproperties.h
@@ -24,7 +24,7 @@
 
 namespace KexiDB {
 
-//! @todo implement KConfigBase interface here?
+//! @todo implement TDEConfigBase interface here?
 
 //! A set of storable database properties.
 /*! This is a convenience class that allows to store global dabatase properties without a need 
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index 96802596..ce6a3923 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -98,7 +98,7 @@ tristate SQLiteVacuum::run()
 		const uint newSize = TQFileInfo(m_filePath).size();
 		const uint decrease = 100-100*newSize/origSize;
 		KMessageBox::information(0, i18n("The database has been compacted. Current size decreased by %1% to %2.")
-			.arg(decrease).arg(KIO::convertSize(newSize)));
+			.arg(decrease).arg(TDEIO::convertSize(newSize)));
 	}
 	return m_result;
 }
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index f924bc60..4135421d 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -2166,7 +2166,7 @@ KexiMainWindowImpl::storeSettings()
 }
 
 void
-KexiMainWindowImpl::restoreWindowConfiguration(KConfig *config)
+KexiMainWindowImpl::restoreWindowConfiguration(TDEConfig *config)
 {
 	kdDebug()<<"preparing session restoring"<<endl;
 
@@ -2184,7 +2184,7 @@ KexiMainWindowImpl::restoreWindowConfiguration(KConfig *config)
 }
 
 void
-KexiMainWindowImpl::storeWindowConfiguration(KConfig *config)
+KexiMainWindowImpl::storeWindowConfiguration(TDEConfig *config)
 {
 	kdDebug()<<"preparing session saving"<<endl;
 	config->setGroup("MainWindow");
@@ -2203,12 +2203,12 @@ KexiMainWindowImpl::storeWindowConfiguration(KConfig *config)
 }
 
 void
-KexiMainWindowImpl::readProperties(KConfig *config) {
+KexiMainWindowImpl::readProperties(TDEConfig *config) {
 	restoreWindowConfiguration(config);
 }
 
 void
-KexiMainWindowImpl::saveProperties(KConfig *config)
+KexiMainWindowImpl::saveProperties(TDEConfig *config)
 {
 	storeWindowConfiguration(config);
 //        m_docManager->saveDocumentList (config);
@@ -2216,7 +2216,7 @@ KexiMainWindowImpl::saveProperties(KConfig *config)
 }
 
 void
-KexiMainWindowImpl::saveGlobalProperties( KConfig* sessionConfig ) {
+KexiMainWindowImpl::saveGlobalProperties( TDEConfig* sessionConfig ) {
 	storeWindowConfiguration(sessionConfig);
 }
 
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 0e81a91b..9721a558 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -106,9 +106,9 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		virtual int generatePrivateID();
 
 		/*! Reimplemented */
-		virtual void readProperties(KConfig *config);
-		virtual void saveProperties(KConfig *config);
-		virtual void saveGlobalProperties( KConfig* sessionConfig );
+		virtual void readProperties(TDEConfig *config);
+		virtual void saveProperties(TDEConfig *config);
+		virtual void saveGlobalProperties( TDEConfig* sessionConfig );
 
 	public slots:
 		/*! Inherited from KMdiMainFrm: we need to do some tasks before child is closed.
@@ -303,8 +303,8 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		/*! Updates application's caption - also shows project's name. */
 		void updateAppCaption();
 
-		void restoreWindowConfiguration(KConfig *config);
-		void storeWindowConfiguration(KConfig *config);
+		void restoreWindowConfiguration(TDEConfig *config);
+		void storeWindowConfiguration(TDEConfig *config);
 
 		virtual bool queryClose();
 		virtual bool queryExit();
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index d95107c0..c775b087 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -413,7 +413,7 @@ void updatePropEditorDockWidthInfo() {
 		KexiMainWindowImpl *wnd;
 		KexitStatusBar *statusBar;
 		KexiProject *prj;
-		KConfig *config;
+		TDEConfig *config;
 #ifndef KEXI_NO_CTXT_HELP
 		KexiContextHelp *ctxHelp;
 #endif
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index b8ad5ebd..66fe0028 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -63,7 +63,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
 {
 	KexiSimplePrintingSettings settings; //this will set defaults
 
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("Simple Printing");
 	if (config->hasKey("pageTitleFont"))
 		settings.pageTitleFont = config->readFontEntry("pageTitleFont");
@@ -95,7 +95,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
 
 void KexiSimplePrintingSettings::save()
 {
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("Simple Printing");
 	config->writeEntry( "pageTitleFont", pageTitleFont );
 	config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) );
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index dfeaedd3..6b8ab9d4 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -99,8 +99,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 //(js)    d->autoSelectExtCheckBox = 0; // delayed loading
 //TODO    d->autoSelectExtChecked = false;
 //(js)    d->urlBar = 0; // delayed loading
-//TODO    KConfig *config = TDEGlobal::config();
-//TODO    KConfigGroupSaver cs( config, ConfigGroup );
+//TODO    TDEConfig *config = TDEGlobal::config();
+//TODO    TDEConfigGroupSaver cs( config, ConfigGroup );
 //TODO    d->initializeSpeedbar = config->readBoolEntry( "Set speedbar defaults",
 //TODO                                                   true );
 //TODO    d->completionLock = false;
diff --git a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
index 00b5a21d..8918c37c 100644
--- a/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
+++ b/kexi/plugins/scripting/kexidb/kexidbdrivermanager.cpp
@@ -104,7 +104,7 @@ KexiDBConnectionData* KexiDBDriverManager::createConnectionDataByFile(const TQSt
         mimename = KMimeType::findByURL(filename)->name();
 
     if(mimename == "application/x-kexiproject-shortcut" || mimename == "application/x-kexi-connectiondata") {
-        KConfig config(filename, true, false);
+        TDEConfig config(filename, true, false);
         TQString groupkey;
         TQStringList groups(config.groupList());
         TQStringList::ConstIterator it, end( groups.constEnd() );
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index bd6454de..3dd90a68 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -89,7 +89,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender)
 	if(scriptaction) {
 
 		const TQString dontAskAgainName = "askExecuteScript";
-		KConfig* config = TDEGlobal::config();
+		TDEConfig* config = TDEGlobal::config();
 		TQString dontask = config->readEntry(dontAskAgainName).lower();
 
 		bool exec = (dontask == "yes");
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index c81b967f..96a50350 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -108,7 +108,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
 		TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
 	
-	KConfig *config = kapp->config();
+	TDEConfig *config = kapp->config();
 	config->setGroup("MainWindow");
 	if ((m_features & SingleClickOpensItemOptionEnabled) 
 		&& config->readBoolEntry("SingleClickOpensItem", false))