summaryrefslogtreecommitdiffstats
path: root/kamera/kcontrol/kameradevice.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:33:36 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:33:36 -0600
commit3c5631f74d1c75204f950140331e10f739082ee9 (patch)
treea2811ff6c81d3c771745cde47734e65b1da3d806 /kamera/kcontrol/kameradevice.h
parent6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (diff)
downloadtdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.tar.gz
tdegraphics-3c5631f74d1c75204f950140331e10f739082ee9.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kamera/kcontrol/kameradevice.h')
-rw-r--r--kamera/kcontrol/kameradevice.h8
1 files changed, 4 insertions, 4 deletions
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;