diff options
| -rw-r--r-- | core/time.c | 2 | ||||
| -rw-r--r-- | qt-models/divetripmodel.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/time.c b/core/time.c index 9992658b6..cbf7d2e2a 100644 --- a/core/time.c +++ b/core/time.c @@ -108,7 +108,7 @@ timestamp_t utc_mktime(struct tm *tm) /* First normalize relative to 1900 */ if (year < 50) year += 100; - else if (year > 1900) + else if (year >= 1900) year -= 1900; if (year < 0 || year > 129) /* algo only works for 1900-2099 */ diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index d384b1913..20bdc3666 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -94,10 +94,10 @@ QVariant DiveItem::data(int column, int role) const Q_ASSERT(dive != NULL); switch (column) { case NR: - retVal = (qulonglong)dive->when; + retVal = (qlonglong)dive->when; break; case DATE: - retVal = (qulonglong)dive->when; + retVal = (qlonglong)dive->when; break; case RATING: retVal = dive->rating; |