Changed configuration directory.

- New path is /usr/share/qtcamera/config/
- define DATA_DIR to be used by all classes

diff --git a/lib/qtcamconfig.cpp b/lib/qtcamconfig.cpp
index b570ac7..b056078 100644 (file)
--- a/lib/qtcamconfig.cpp
+++ b/lib/qtcamconfig.cpp
@@ -23,7 +23,7 @@
 #include <QStringList>
 #include <QDebug>
 
-#define CONFIGURATION_FILE                    "/etc/qtcamera/qtcamera.ini"
+#define CONFIGURATION_FILE                    DATA_DIR"/qtcamera.ini"
 
 class QtCamConfigPrivate {
 public:

diff --git a/lib/qtcamconfig.h b/lib/qtcamconfig.h
index 7b2e203..a60e923 100644 (file)
--- a/lib/qtcamconfig.h
+++ b/lib/qtcamconfig.h
@@ -34,6 +34,10 @@
 #define RENDERER_TYPE_MEEGO                   "meego"
 #define RENDERER_TYPE_GENERIC                 "generic"
 
+#ifndef DATA_DIR
+#define DATA_DIR                              "/usr/share/qtcamera/config/"
+#endif /* DATA_DIR */
+
 class QtCamConfigPrivate;
 
 class QtCamConfig : public QObject {

diff --git a/lib/qtcampropertysetter.cpp b/lib/qtcampropertysetter.cpp
index 7d21e69..4f10833 100644 (file)
--- a/lib/qtcampropertysetter.cpp
+++ b/lib/qtcampropertysetter.cpp
@@ -23,7 +23,7 @@
 #include <QSettings>
 #include <QDebug>
 
-#define PROPERTIES_FILE                       "/etc/qtcamera/properties.ini"
+#define PROPERTIES_FILE                       DATA_DIR"/properties.ini"
 
 class QtCamPropertySetterPrivate {
 public: