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

5 files changed, 13 insertions, 13 deletions

diff --git a/kview/kviewcanvas/ChangeLog b/kview/kviewcanvas/ChangeLog
index 9ec3ee84..73d74094 100644
--- a/kview/kviewcanvas/ChangeLog
+++ b/kview/kviewcanvas/ChangeLog
@@ -1,7 +1,7 @@
 2003-09-27  Matthias Kretz <[email protected]>
 
 	* config/confmodules.cpp:
-		Call m_config->sync() in save() and use a real KConfig object instead of
+		Call m_config->sync() in save() and use a real TDEConfig object instead of
 		a KSimpleConfig.
 	* kimagecanvas.cpp:
 		Renamed readSettings to loadSettings and call it in the ctor.
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index 4ecf07b9..84f897c4 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -35,8 +35,8 @@ typedef KGenericFactory<KViewCanvasConfig, TQWidget> KViewCanvasConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kviewcanvasconfig, KViewCanvasConfigFactory( "kcm_kviewcanvasconfig" ) )
 
 KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQStringList & args )
-	: KCModule( KViewCanvasConfigFactory::instance(), parent, args )
-	, m_config( new KConfig( "kviewcanvasrc" ) )
+	: TDECModule( KViewCanvasConfigFactory::instance(), parent, args )
+	, m_config( new TDEConfig( "kviewcanvasrc" ) )
 {
 	TQBoxLayout * layout = new TQVBoxLayout( this );
 	layout->setAutoAdd( true );
@@ -77,7 +77,7 @@ KViewCanvasConfig::~KViewCanvasConfig()
 
 void KViewCanvasConfig::save()
 {
-	KConfigGroup cfgGroup( m_config, "Settings" );
+	TDEConfigGroup cfgGroup( m_config, "Settings" );
 	cfgGroup.writeEntry( "Smooth Scaling", m_pWidget->m_pSmoothScaling->isChecked() );
 	cfgGroup.writeEntry( "Keep Aspect Ratio", m_pWidget->m_pKeepRatio->isChecked() );
 	cfgGroup.writeEntry( "Center Image", m_pWidget->m_pCenterImage->isChecked() );
@@ -89,7 +89,7 @@ void KViewCanvasConfig::save()
 	cfgGroup.writeEntry( "Maximum Width" , m_pWidget->m_pMaxWidth->value() );
 	cfgGroup.writeEntry( "Maximum Height", m_pWidget->m_pMaxHeight->value() );
 
-	KConfigGroup cfgGroup2( m_config, "Blend Effects" );
+	TDEConfigGroup cfgGroup2( m_config, "Blend Effects" );
 	TQCheckListItem *item = m_items.first();
 	for( int i = 1; item; item = m_items.next(), ++i )
 		cfgGroup2.writeEntry( TQString::number( i ), item->isOn() );
@@ -98,7 +98,7 @@ void KViewCanvasConfig::save()
 
 void KViewCanvasConfig::load()
 {
-	KConfigGroup cfgGroup( m_config, "Settings" );
+	TDEConfigGroup cfgGroup( m_config, "Settings" );
 	m_pWidget->m_pSmoothScaling->setChecked( cfgGroup.readBoolEntry( "Smooth Scaling", Defaults::smoothScaling ) );
 	m_pWidget->m_pKeepRatio->setChecked( cfgGroup.readBoolEntry( "Keep Aspect Ratio", Defaults::keepAspectRatio ) );
 	m_pWidget->m_pCenterImage->setChecked( cfgGroup.readBoolEntry( "Center Image", Defaults::centerImage ) );
@@ -110,7 +110,7 @@ void KViewCanvasConfig::load()
 	m_pWidget->m_pMaxWidth ->setValue( cfgGroup.readNumEntry( "Maximum Width" , Defaults::maxSize.width() ) );
 	m_pWidget->m_pMaxHeight->setValue( cfgGroup.readNumEntry( "Maximum Height", Defaults::maxSize.height() ) );
 
-	KConfigGroup cfgGroup2( m_config, "Blend Effects" );
+	TDEConfigGroup cfgGroup2( m_config, "Blend Effects" );
 	TQCheckListItem * item = m_items.first();
 	for( int i = 1; item; item = m_items.next(), ++i )
 		item->setOn( cfgGroup2.readBoolEntry( TQString::number( i ), false ) );
diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h
index 0c6df7a1..62980957 100644
--- a/kview/kviewcanvas/config/confmodules.h
+++ b/kview/kviewcanvas/config/confmodules.h
@@ -24,9 +24,9 @@
 
 class GeneralConfigWidget;
 class TQCheckListItem;
-class KConfig;
+class TDEConfig;
 
-class KViewCanvasConfig : public KCModule
+class KViewCanvasConfig : public TDECModule
 {
 	Q_OBJECT
   
@@ -42,7 +42,7 @@ class KViewCanvasConfig : public KCModule
 		void configChanged();
 
 	private:
-		KConfig * m_config;
+		TDEConfig * m_config;
 		GeneralConfigWidget * m_pWidget;
 		TQPtrList<TQCheckListItem> m_items;
 };
diff --git a/kview/kviewcanvas/config/kviewcanvasconfig.desktop b/kview/kviewcanvas/config/kviewcanvasconfig.desktop
index a3633284..692d3ad7 100644
--- a/kview/kviewcanvas/config/kviewcanvasconfig.desktop
+++ b/kview/kviewcanvas/config/kviewcanvasconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kview
 Type=Service
-ServiceTypes=KCModule
+ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kviewcanvasconfig
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index cffce25e..4411d752 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -823,7 +823,7 @@ void KImageCanvas::slotImageChanged()
 
 void KImageCanvas::loadSettings()
 {
-	KConfigGroup cfgGroup( KImageCanvasFactory::instance()->config(),
+	TDEConfigGroup cfgGroup( KImageCanvasFactory::instance()->config(),
 			"Settings" );
 	setFastScale( ! cfgGroup.readBoolEntry( "Smooth Scaling", ! fastScale() ) );
 	setKeepAspectRatio( cfgGroup.readBoolEntry( "Keep Aspect Ratio",
@@ -839,7 +839,7 @@ void KImageCanvas::loadSettings()
 					maximumImageSize().width() ), cfgGroup.readNumEntry(
 					"Maximum Height", maximumImageSize().height() ) ) );
 
-	KConfigGroup blendConfig( KImageCanvasFactory::instance()->config(),
+	TDEConfigGroup blendConfig( KImageCanvasFactory::instance()->config(),
 			"Blend Effects" );
 	/* TODO
 	m_vEffects.clear();