Rename Campass and Orientation to CameraCompass and CameraOrientation

diff --git a/qml/MainPage.qml b/qml/MainPage.qml
index ee91177..c1ca7bc 100644 (file)
--- a/qml/MainPage.qml
+++ b/qml/MainPage.qml
@@ -128,12 +128,12 @@ CameraPage {
         dateTimeEnabled: true
     }
 
         dateTimeEnabled: true
     }
 

-    Orientation {
+    CameraOrientation {

         id: orientation
         active: viewfinder.camera.running || (mainView.currentIndex == 2 && Qt.application.active)
     }
 
         id: orientation
         active: viewfinder.camera.running || (mainView.currentIndex == 2 && Qt.application.active)
     }
 

-    Compass {
+    CameraCompass {

         id: compass
         active: viewfinder.camera.running
     }
         id: compass
         active: viewfinder.camera.running
     }

diff --git a/src/main.cpp b/src/main.cpp
index b6aa3d0..0ddd0fd 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -119,8 +119,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) {
   qmlRegisterType<DisplayState>("CameraPlus", 1, 0, "DisplayState");
   qmlRegisterType<FSMonitor>("CameraPlus", 1, 0, "FSMonitor");
   qmlRegisterType<CameraResources>("CameraPlus", 1, 0, "CameraResources");
   qmlRegisterType<DisplayState>("CameraPlus", 1, 0, "DisplayState");
   qmlRegisterType<FSMonitor>("CameraPlus", 1, 0, "FSMonitor");
   qmlRegisterType<CameraResources>("CameraPlus", 1, 0, "CameraResources");

-  qmlRegisterType<Compass>("CameraPlus", 1, 0, "Compass");
-  qmlRegisterType<Orientation>("CameraPlus", 1, 0, "Orientation");
+  qmlRegisterType<Compass>("CameraPlus", 1, 0, "CameraCompass");
+  qmlRegisterType<Orientation>("CameraPlus", 1, 0, "CameraOrientation");

   qmlRegisterType<MountProtector>("CameraPlus", 1, 0, "MountProtector");
   qmlRegisterType<TrackerStore>("CameraPlus", 1, 0, "TrackerStore");
   qmlRegisterType<FocusRectangle>("CameraPlus", 1, 0, "FocusRectangle");
   qmlRegisterType<MountProtector>("CameraPlus", 1, 0, "MountProtector");
   qmlRegisterType<TrackerStore>("CameraPlus", 1, 0, "TrackerStore");
   qmlRegisterType<FocusRectangle>("CameraPlus", 1, 0, "FocusRectangle");