4 files changed, 9 insertions, 9 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index fd9b795c..f3c89149 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <kgenericfactory.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <tdemessagebox.h>
@@ -53,7 +53,7 @@ KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringL
 {
 	m_devicePopup = new TDEPopupMenu(this);
 	m_actions = new TDEActionCollection(this);
-	m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
+	m_config = new TDESimpleConfig(KProtocolInfo::config("camera"));
 
 	m_context = gp_context_new();
 	if (m_context) {
diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h
index 3e92ed1f..ce3b88d4 100644
--- a/kamera/kcontrol/kamera.h
+++ b/kamera/kcontrol/kamera.h
@@ -38,7 +38,7 @@ class TQIconViewItem;
 
 class KCamera;
 class KameraDeviceSelectDialog;
-class KSimpleConfig;
+class TDESimpleConfig;
 class TDEIconView;
 class TDEActionCollection;
 class TDEToolBar;
@@ -92,7 +92,7 @@ private:
 private:
 	typedef TQMap<TQString, KCamera *> CameraDevicesMap;
 	
-	KSimpleConfig *m_config;
+	TDESimpleConfig *m_config;
 	CameraDevicesMap m_devices;
 	bool m_cancelPending;
 
diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 0aa8e25d..8810bcc5 100644
--- a/kamera/tdeioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -33,10 +33,10 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdestandarddirs.h>
 #include <tdeconfig.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
 #include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <tdeio/slaveconfig.h>
@@ -95,7 +95,7 @@ m_camera(NULL)
 	// (will init m_camera, since the m_camera's configuration is empty)
 	m_camera = 0;
 	m_file = NULL;
-	m_config = new KSimpleConfig(KProtocolInfo::config("camera"));
+	m_config = new TDESimpleConfig(KProtocolInfo::config("camera"));
 	m_context = gp_context_new();
 	actiondone = true;
 	cameraopen = false;
diff --git a/kamera/tdeioslave/kamera.h b/kamera/tdeioslave/kamera.h
index 1e015d0f..48d38165 100644
--- a/kamera/tdeioslave/kamera.h
+++ b/kamera/tdeioslave/kamera.h
@@ -27,7 +27,7 @@
 #include <tdeio/slavebase.h>
 #include <gphoto2.h>
 
-class KSimpleConfig;
+class TDESimpleConfig;
 
 class KameraProtocol : public TDEIO::SlaveBase
 {
@@ -49,7 +49,7 @@ public:
 private:
 	Camera *m_camera;
 	CameraAbilities m_abilities;
-	KSimpleConfig *m_config;
+	TDESimpleConfig *m_config;
 
 	GPContext	*m_context;