| -rw-r--r-- | libopie2/opiecore/device/odevice_htc.cpp | 3 | ||||
| -rw-r--r-- | libopie2/opiepim/private/opimeventsortvector.cpp | 9 |
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 @@ -421,5 +421,5 @@ Transformation HTC::rotation() const { qDebug( "HTC::rotation()" ); - Transformation rot; + Transformation rot = Rot270; switch ( d->m_model ) { @@ -430,5 +430,4 @@ Transformation HTC::rotation() const 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 @@ -38,7 +38,5 @@ 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(); @@ -61,5 +59,5 @@ inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPi } - int ret; + int ret = 0; // Now compare this found alarms @@ -68,5 +66,5 @@ 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++; } @@ -74,5 +72,4 @@ inline int testAlarmNotifiers( const OPimNotifyManager& leftnotifiers, const OPi } -} OPimEventSortVector::OPimEventSortVector( uint size, bool asc, int sort ) |