summaryrefslogtreecommitdiffstats
path: root/kamera/tdeioslave/kamera.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kamera/tdeioslave/kamera.cpp')
-rw-r--r--kamera/tdeioslave/kamera.cpp10
1 files changed, 5 insertions, 5 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;