2 files changed, 4 insertions, 8 deletions

diff --git a/libopie2/opiecore/device/odevice_htc.cpp b/libopie2/opiecore/device/odevice_htc.cpp
index c21e10d..4e5200b 100644
--- a/libopie2/opiecore/device/odevice_htc.cpp
+++ b/libopie2/opiecore/device/odevice_htc.cpp
@@ -422,3 +422,3 @@ Transformation HTC::rotation() const
     qDebug( "HTC::rotation()" );
-    Transformation rot;
+    Transformation rot = Rot270;
 
@@ -431,3 +431,2 @@ Transformation HTC::rotation() const
             else if ( hs == CASE_UNKNOWN ) rot = Rot270;
-            else rot = Rot270;
         }
diff --git a/libopie2/opiepim/private/opimeventsortvector.cpp b/libopie2/opiepim/private/opimeventsortvector.cpp
index 4220c63..b85f848 100644
--- a/libopie2/opiepim/private/opimeventsortvector.cpp
+++ b/libopie2/opiepim/private/opimeventsortvector.cpp
@@ -39,5 +39,3 @@ namespace Internal {
 
-namespace{
-
-inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPimNotifyManager& rightnotifiers ){
+int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPimNotifyManager& rightnotifiers ){
         OPimNotifyManager::Alarms left_alarms = leftnotifiers.alarms();
@@ -62,3 +60,3 @@ inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPi
         
-        int ret;
+        int ret = 0;
         
@@ -69,3 +67,3 @@ inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPi
         if ( left_earliest.isValid() && right_earliest.isValid() ){
-                ret += left_earliest < right_earliest ? -1 : 1;    
+                left_earliest < right_earliest ? ret-- : ret++;
         }
@@ -75,3 +73,2 @@ inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPi
 }
-}