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

4 files changed, 9 insertions, 9 deletions

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 5bca35b6..f7481526 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -49,7 +49,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kamera, KKameraConfigFactory( "kcmkamera" ) )
 KKameraConfig *KKameraConfig::m_instance = NULL;
 
 KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
-	: KCModule(KKameraConfigFactory::instance(), parent, name)
+	: TDECModule(KKameraConfigFactory::instance(), parent, name)
 {
 	m_devicePopup = new KPopupMenu(this);
 	m_actions = new KActionCollection(this);
diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h
index 4bf3d759..6b1996f9 100644
--- a/kamera/kcontrol/kamera.h
+++ b/kamera/kcontrol/kamera.h
@@ -44,7 +44,7 @@ class KActionCollection;
 class KToolBar;
 class KPopupMenu;
 
-class KKameraConfig : public KCModule
+class KKameraConfig : public TDECModule
 {
 	Q_OBJECT
   
@@ -54,7 +54,7 @@ public:
 	KKameraConfig(TQWidget *parent, const char *name, const TQStringList &);
 	virtual ~KKameraConfig();
 
-	// KCModule interface methods
+	// TDECModule interface methods
 	void load();
 	void load(bool useDefaults);
 	void save();
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 9492934b..20d090fa 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -190,7 +190,7 @@ bool KCamera::test()
 	return camera() != 0;
 }
 
-void KCamera::load(KConfig *config)
+void KCamera::load(TDEConfig *config)
 {
 	config->setGroup(m_name);
 	if (m_model.isNull())
@@ -200,7 +200,7 @@ void KCamera::load(KConfig *config)
 	invalidateCamera();
 }
 
-void KCamera::save(KConfig *config)
+void KCamera::save(TDEConfig *config)
 {
 	config->setGroup(m_name);
 	config->writeEntry("Model", m_model);
diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h
index 8046ac88..5ee6fea8 100644
--- a/kamera/kcontrol/kameradevice.h
+++ b/kamera/kcontrol/kameradevice.h
@@ -27,7 +27,7 @@
 #include <kdialogbase.h>
 #include <config.h>
 
-class KConfig;
+class TDEConfig;
 class TQString;
 class KListView;
 class TQWidgetStack;
@@ -46,8 +46,8 @@ public:
 	~KCamera();
 	void invalidateCamera();
 	bool configure();
-	void load(KConfig *m_config);
-	void save(KConfig *m_config);
+	void load(TDEConfig *m_config);
+	void save(TDEConfig *m_config);
 	bool test();
 	TQStringList supportedPorts();
 
@@ -78,7 +78,7 @@ protected:
 //	int frontend_prompt(Camera *camera, CameraWidget *widgets);
 
 	Camera *m_camera;
-//	KConfig *m_config;
+//	TDEConfig *m_config;
 	TQString m_name; // the camera's real name
 	TQString m_model;
 	TQString m_path;