diff options
Diffstat (limited to 'kamera/tdeioslave')
| -rw-r--r-- | kamera/tdeioslave/kamera.cpp | 10 | ||||
| -rw-r--r-- | kamera/tdeioslave/kamera.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp index 96d65e9a..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 <kstandarddirs.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> @@ -53,7 +53,7 @@ using namespace TDEIO; extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv); + TDE_EXPORT int kdemain(int argc, char **argv); #ifdef HAVE_GPHOTO2_5 static void frontendCameraStatus(GPContext *context, const char *status, void *data); @@ -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; |