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

5 files changed, 15 insertions, 15 deletions

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;