Rename Campass and Orientation to CameraCompass and CameraOrientation

[harmattan/cameraplus] / qml / TextSwitch.qml

diff --git a/qml/TextSwitch.qml b/qml/TextSwitch.qml
index 74e042b..4d95d8b 100644 (file)
--- a/qml/TextSwitch.qml
+++ b/qml/TextSwitch.qml
@@ -20,8 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-@IMPORT_QT_QUICK@
-import com.nokia.meego 1.1
+import QtQuick 2.0
 
 Item {
     property alias text: label.text
@@ -29,18 +28,13 @@ Item {
     width: parent.width
     height: switchComponent.height
 
-    Text {
-        property Style platformStyle: LabelStyle {}
-
+    CameraLabel {
         id: label
         anchors.left: parent.left
-        font.family: platformStyle.fontFamily
-        font.pixelSize: platformStyle.fontPixelSize
-        color: platformStyle.textColor
         wrapMode: Text.Wrap
     }
 
-    Switch {
+    CameraSwitch {
         id: switchComponent
         anchors.right: parent.right
     }