From cb77fdf045b9cedd93b82a9816f2e4e39c1d587e Mon Sep 17 00:00:00 2001
From: Mohammed Sameer <msameer@foolab.org>
Date: Sat, 3 Aug 2013 02:11:11 +0300
Subject: [PATCH] Renamed ImageSettings.qml and VideoSettings.qml to
 ImageModeSettings.qml and VideoModeSettings.qml

Prevent clashing with stuff from declarative QtCamera
---
 qml/{ImageSettings.qml => ImageModeSettings.qml} | 0
 qml/SettingsView.qml                             | 2 +-
 qml/{VideoSettings.qml => VideoModeSettings.qml} | 0
 qml/qml.qrc                                      | 4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename qml/{ImageSettings.qml => ImageModeSettings.qml} (100%)
 rename qml/{VideoSettings.qml => VideoModeSettings.qml} (100%)

diff --git a/qml/ImageSettings.qml b/qml/ImageModeSettings.qml
similarity index 100%
rename from qml/ImageSettings.qml
rename to qml/ImageModeSettings.qml
diff --git a/qml/SettingsView.qml b/qml/SettingsView.qml
index 8965fd5..73897d5 100644
--- a/qml/SettingsView.qml
+++ b/qml/SettingsView.qml
@@ -32,7 +32,7 @@ Item {
     Loader {
         id: loader
         anchors.fill: parent
-        source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoSettings.qml") : Qt.resolvedUrl("ImageSettings.qml")
+        source: settings.mode == Camera.VideoMode ? Qt.resolvedUrl("VideoModeSettings.qml") : Qt.resolvedUrl("ImageModeSettings.qml")
     }
 
     Binding {
diff --git a/qml/VideoSettings.qml b/qml/VideoModeSettings.qml
similarity index 100%
rename from qml/VideoSettings.qml
rename to qml/VideoModeSettings.qml
diff --git a/qml/qml.qrc b/qml/qml.qrc
index 7bf24d2..cfdb470 100644
--- a/qml/qml.qrc
+++ b/qml/qml.qrc
@@ -17,7 +17,7 @@
 	<file>ImageOverlay.qml</file>
 	<file>ImageResolutionSettings.qml</file>
 	<file>ImageSceneButton.qml</file>
-	<file>ImageSettings.qml</file>
+	<file>ImageModeSettings.qml</file>
 	<file>ImageWhiteBalanceButton.qml</file>
 	<file>Indicator.qml</file>
         <file>main.qml</file>
@@ -40,7 +40,7 @@
 	<file>VideoPlayerPage.qml</file>
 	<file>VideoResolutionSettings.qml</file>
 	<file>VideoSceneButton.qml</file>
-	<file>VideoSettings.qml</file>
+	<file>VideoModeSettings.qml</file>
 	<file>VideoTorchButton.qml</file>
 	<file>VideoWhiteBalanceButton.qml</file>
 	<file>ZoomCaptureButton.qml</file>
-- 
2.25.1