X-Git-Url: http://git.maemo.org/git/?p=movie-schedule;a=blobdiff_plain;f=src%2Futils%2Ftimeutils.cpp;h=2af4f7ba8c5767bc6e9ad3980c8dbf4748c82cf9;hp=3597c4050360865f7b311e6d0e206578d8bd13df;hb=bb467534ecac666816ae036272a474174d9d8449;hpb=99e8e1c020bfbffa186db00899b0b40c07a3b89f

diff --git a/src/utils/timeutils.cpp b/src/utils/timeutils.cpp
index 3597c40..2af4f7b 100644
--- a/src/utils/timeutils.cpp
+++ b/src/utils/timeutils.cpp
@@ -34,6 +34,7 @@ QTime TimeUtils::FromTimeString(const QString &time)
         ++m;
     }
     if (m == 0 || pos >= n || time[pos] != ':') {
+        // syntax error
         return QTime();
     }
     ++pos;
@@ -44,6 +45,7 @@ QTime TimeUtils::FromTimeString(const QString &time)
         ++m;
     }
     if (m == 0) {
+        // syntax error
         return QTime();
     }
     if (pos < n) {
@@ -53,15 +55,13 @@ QTime TimeUtils::FromTimeString(const QString &time)
                 hours += 12;
             }
         } else if (s.compare("am", Qt::CaseInsensitive) == 0) {
-            // nothing to do
+            if (hours >= 12) {
+                hours -= 12;
+            }
         } else {
+            // illegal suffix
             return QTime();
         }
-    } else {
-        // assume pm as default
-        if (hours < 12) {
-            hours += 12;
-        }
     }
     return QTime(hours, minutes);
 }