Make more components harmattan specific

diff --git a/src/batteryinfo.cpp b/src/harmattan/batteryinfo.cpp
similarity index 100%
rename from src/batteryinfo.cpp
rename to src/harmattan/batteryinfo.cpp

diff --git a/src/batteryinfo.h b/src/harmattan/batteryinfo.h
similarity index 100%
rename from src/batteryinfo.h
rename to src/harmattan/batteryinfo.h

diff --git a/src/compass.cpp b/src/harmattan/compass.cpp
similarity index 100%
rename from src/compass.cpp
rename to src/harmattan/compass.cpp

diff --git a/src/compass.h b/src/harmattan/compass.h
similarity index 100%
rename from src/compass.h
rename to src/harmattan/compass.h

diff --git a/src/devicekeys.cpp b/src/harmattan/devicekeys.cpp
similarity index 100%
rename from src/devicekeys.cpp
rename to src/harmattan/devicekeys.cpp

diff --git a/src/devicekeys.h b/src/harmattan/devicekeys.h
similarity index 100%
rename from src/devicekeys.h
rename to src/harmattan/devicekeys.h

diff --git a/src/displaystate.cpp b/src/harmattan/displaystate.cpp
similarity index 100%
rename from src/displaystate.cpp
rename to src/harmattan/displaystate.cpp

diff --git a/src/displaystate.h b/src/harmattan/displaystate.h
similarity index 100%
rename from src/displaystate.h
rename to src/harmattan/displaystate.h

diff --git a/src/fsmonitor.cpp b/src/harmattan/fsmonitor.cpp
similarity index 100%
rename from src/fsmonitor.cpp
rename to src/harmattan/fsmonitor.cpp

diff --git a/src/fsmonitor.h b/src/harmattan/fsmonitor.h
similarity index 100%
rename from src/fsmonitor.h
rename to src/harmattan/fsmonitor.h

diff --git a/src/harmattan/harmattan.pri b/src/harmattan/harmattan.pri
index 03f9fb5..36ac51c 100644 (file)
--- a/src/harmattan/harmattan.pri
+++ b/src/harmattan/harmattan.pri
@@ -3,5 +3,10 @@ INCLUDEPATH += harmattan .
 
 PKGCONFIG += quill contextsubscriber-1.0 QtLocation QtSystemInfo
 
-HEADERS += quillitem.h soundvolumecontrol.h deviceinfo.h geocode.h
-SOURCES += quillitem.cpp soundvolumecontrol.cpp deviceinfo.cpp geocode.cpp
+HEADERS += quillitem.h soundvolumecontrol.h deviceinfo.h geocode.h \
+          mountprotector.h batteryinfo.h compass.h devicekeys.h \
+          displaystate.h fsmonitor.h orientation.h
+
+SOURCES += quillitem.cpp soundvolumecontrol.cpp deviceinfo.cpp geocode.cpp \
+          mountprotector.cpp batteryinfo.cpp compass.cpp devicekeys.cpp \
+          displaystate.cpp fsmonitor.cpp orientation.cpp

diff --git a/src/mountprotector.cpp b/src/harmattan/mountprotector.cpp
similarity index 100%
rename from src/mountprotector.cpp
rename to src/harmattan/mountprotector.cpp

diff --git a/src/mountprotector.h b/src/harmattan/mountprotector.h
similarity index 100%
rename from src/mountprotector.h
rename to src/harmattan/mountprotector.h

diff --git a/src/orientation.cpp b/src/harmattan/orientation.cpp
similarity index 100%
rename from src/orientation.cpp
rename to src/harmattan/orientation.cpp

diff --git a/src/orientation.h b/src/harmattan/orientation.h
similarity index 100%
rename from src/orientation.h
rename to src/harmattan/orientation.h

diff --git a/src/src.pro b/src/src.pro
index 76bd49e..94748b0 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -17,17 +17,16 @@ qt5 {
     PKGCONFIG += Qt5Sparql qmsystem2-qt5 libresourceqt5 qdeclarative5-boostable
 }
 
-SOURCES += main.cpp settings.cpp filenaming.cpp displaystate.cpp fsmonitor.cpp \
-           cameraresources.cpp compass.cpp orientation.cpp mountprotector.cpp \
-           trackerstore.cpp focusrectangle.cpp sharehelper.cpp deletehelper.cpp galleryhelper.cpp \
-           postcapturemodel.cpp batteryinfo.cpp gridlines.cpp devicekeys.cpp \
-           platformsettings.cpp dbusservice.cpp
-
-HEADERS += settings.h filenaming.h displaystate.h fsmonitor.h \
-           cameraresources.h compass.h orientation.h mountprotector.h \
-           trackerstore.h focusrectangle.h sharehelper.h deletehelper.h galleryhelper.h \
-           postcapturemodel.h batteryinfo.h gridlines.h devicekeys.h \
-           platformsettings.h dbusservice.h
+SOURCES += main.cpp \
+           settings.cpp filenaming.cpp cameraresources.cpp \
+           trackerstore.cpp focusrectangle.cpp sharehelper.cpp \
+           deletehelper.cpp galleryhelper.cpp postcapturemodel.cpp \
+           gridlines.cpp platformsettings.cpp dbusservice.cpp
+
+HEADERS += settings.h filenaming.h cameraresources.h \
+           trackerstore.h focusrectangle.h sharehelper.h \
+           deletehelper.h galleryhelper.h postcapturemodel.h \
+           gridlines.h platformsettings.h dbusservice.h
 
 RESOURCES += ../qml/qml.qrc