Fixed searchclients to handle new Google URLs correctly; added GUI

[movie-schedule] / src / utils / timeutils.cpp

diff --git a/src/utils/timeutils.cpp b/src/utils/timeutils.cpp
index 3597c40..2af4f7b 100644 (file)
--- 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] != ':') {
         ++m;
     }
     if (m == 0 || pos >= n || time[pos] != ':') {

+        // syntax error

         return QTime();
     }
     ++pos;
         return QTime();
     }
     ++pos;

@@ -44,6 +45,7 @@ QTime TimeUtils::FromTimeString(const QString &time)
         ++m;
     }
     if (m == 0) {
         ++m;
     }
     if (m == 0) {

+        // syntax error

         return QTime();
     }
     if (pos < n) {
         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) {
                 hours += 12;
             }
         } else if (s.compare("am", Qt::CaseInsensitive) == 0) {

-            // nothing to do
+            if (hours >= 12) {
+                hours -= 12;
+            }

         } else {
         } else {

+            // illegal suffix

             return QTime();
         }
             return QTime();
         }

-    } else {
-        // assume pm as default
-        if (hours < 12) {
-            hours += 12;
-        }

     }
     return QTime(hours, minutes);
 }
     }
     return QTime(hours, minutes);
 }