Each file in this commit has an issue where the initial value of a variable

is assumed to be something but no initial value is given.

This commit changes that by either assigning an initial value or removing
the assumption on an initial value (usually the former).

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
@@ -420,7 +420,7 @@ bool HTC::setDisplayStatus( bool on )
 Transformation HTC::rotation() const
 {
     qDebug( "HTC::rotation()" );
-    Transformation rot;
+    Transformation rot = Rot270;
 
     switch ( d->m_model ) {
         case Model_HTC_Universal:
@@ -429,7 +429,6 @@ Transformation HTC::rotation() const
             qDebug( "HTC::rotation() - hinge sensor = %d", (int) hs );
             if ( hs == CASE_PORTRAIT ) rot = Rot0;
             else if ( hs == CASE_UNKNOWN ) rot = Rot270;
-            else rot = Rot270;
         }
         break;
     }
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
@@ -37,9 +37,7 @@
 namespace Opie {
 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();
 	OPimNotifyManager::Alarms right_alarms = rightnotifiers.alarms();
 	
@@ -60,20 +58,19 @@ inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPi
 		}
 	}
 	
-	int ret;
+	int ret = 0;
 	
 	// Now compare this found alarms
 	if ( !left_earliest .isValid() ) ret++;
 	if ( !right_earliest.isValid() ) ret--;
 	
 	if ( left_earliest.isValid() && right_earliest.isValid() ){
-		ret += left_earliest < right_earliest ? -1 : 1;    
+		left_earliest < right_earliest ? ret-- : ret++;
 	}
 	
 	return ret;
 	
 }
-}
 
 OPimEventSortVector::OPimEventSortVector( uint size, bool asc, int sort )
     : OPimSortVector<OPimEvent>( size, asc, sort ) {}