Diffstat (limited to 'libopie2/opiepim/private/opimeventsortvector.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | libopie2/opiepim/private/opimeventsortvector.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
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 ) |