Make appearance and rotate applet use the new rotation method of odevice.

1 files changed, 16 insertions, 9 deletions

diff --git a/core/applets/rotateapplet/rotate.cpp b/core/applets/rotateapplet/rotate.cpp
index 04270f1..62567ed 100644
--- a/core/applets/rotateapplet/rotate.cpp
+++ b/core/applets/rotateapplet/rotate.cpp
@@ -37,4 +37,8 @@
 
+#include <opie/odevice.h>
+
 #include "rotate.h"
 
+using namespace Opie;
+
 
@@ -115,4 +119,3 @@ void RotateApplet::activated ( )
     int defaultRotation = QPEApplication::defaultRotation();
-
-    int newRotation;
+    int newRotation = defaultRotation;
 
@@ -121,4 +124,10 @@ void RotateApplet::activated ( )
 
-    // 0 -> 90° clockwise, 1 -> 90° counterclockwise
-    int rotDirection = cfg.readNumEntry( "rotatedir", 0 );
+    int rotDirection = cfg.readNumEntry( "rotatedir" );
+    ODirection rot = CW;
+
+    if (rotDirection == -1) {
+            rot = ODevice::inst ( )-> direction ( );
+    } else {
+        rot = (ODirection)rotDirection;
+    }
 
@@ -132,7 +141,7 @@ void RotateApplet::activated ( )
     } else {
-        if ( rotDirection == 1 )  {
+        if ( rot == CCW )  {
             newRotation = ( defaultRotation + 90 ) % 360;
-        } else if ( rotDirection == 0 ) {
+        } else if ( rot == CW ) {
             newRotation = ( defaultRotation + 270 ) % 360;
-        } else {
+        } else if ( rot == Flip ) {
             newRotation = ( defaultRotation + 180 ) % 360;
@@ -165,3 +174 @@ Q_EXPORT_INTERFACE( )
 }
-
-