Silence -Wshorten-64-to-32 warnings

3 files changed, 19 insertions, 12 deletions

diff --git a/src/core/imap/MCIMAPSearchExpression.cc b/src/core/imap/MCIMAPSearchExpression.cc
index 4e843b98..70c70d0b 100644
--- a/src/core/imap/MCIMAPSearchExpression.cc
+++ b/src/core/imap/MCIMAPSearchExpression.cc
@@ -198,7 +198,7 @@ IMAPSearchExpression * IMAPSearchExpression::searchBeforeDate(time_t date)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindBeforeDate;
-    expr->mLongNumber = date;
+    expr->mDateNumber = date;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
@@ -206,7 +206,7 @@ IMAPSearchExpression * IMAPSearchExpression::searchOnDate(time_t date)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindOnDate;
-    expr->mLongNumber = date;
+    expr->mDateNumber = date;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
@@ -214,7 +214,7 @@ IMAPSearchExpression * IMAPSearchExpression::searchSinceDate(time_t date)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindSinceDate;
-    expr->mLongNumber = date;
+    expr->mDateNumber = date;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
@@ -222,14 +222,14 @@ IMAPSearchExpression * IMAPSearchExpression::searchBeforeRecievedDate(time_t dat
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindBeforeRecievedDate;
-    expr->mLongNumber = date;
+    expr->mDateNumber = date;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 IMAPSearchExpression * IMAPSearchExpression::searchOnRecievedDate(time_t date)
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindOnRecievedDate;
-    expr->mLongNumber = date;
+    expr->mDateNumber = date;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
@@ -237,7 +237,7 @@ IMAPSearchExpression * IMAPSearchExpression::searchSinceReciviedDate(time_t date
 {
     IMAPSearchExpression * expr = new IMAPSearchExpression();
     expr->mKind = IMAPSearchKindSinceRecievedDate;
-    expr->mLongNumber = date;
+    expr->mDateNumber = date;
     return (IMAPSearchExpression *) expr->autorelease();
 }
 
@@ -287,6 +287,11 @@ uint64_t IMAPSearchExpression::longNumber()
     return mLongNumber;
 }
 
+time_t IMAPSearchExpression::dateNumber()
+{
+    return mDateNumber;
+}
+
 IMAPSearchExpression * IMAPSearchExpression::leftExpression()
 {
     return mLeftExpression;
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index 27c7307b..21486884 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -18,6 +18,7 @@ namespace mailcore {
         virtual String * header();
         virtual String * value();
         virtual uint64_t longNumber();
+        virtual time_t dateNumber();
         virtual IMAPSearchExpression * leftExpression();
         virtual IMAPSearchExpression * rightExpression();
         
@@ -57,6 +58,7 @@ namespace mailcore {
         String * mHeader;
         String * mValue;
         uint64_t mLongNumber;
+        time_t mDateNumber;
         IMAPSearchExpression * mLeftExpression;
         IMAPSearchExpression * mRightExpression;
         void init();
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index fb820693..6c05b6d0 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -2596,37 +2596,37 @@ static struct mailimap_search_key * searchKeyFromSearchExpression(IMAPSearchExpr
         }
         case IMAPSearchKindBeforeDate:
         {
-            time_t date = expression->longNumber();
+            time_t date = expression->dateNumber();
             tm * timeinfo = localtime(&date);
             return mailimap_search_key_new_sentbefore(mailimap_date_new(timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year));
         }
         case IMAPSearchKindOnDate:
         {
-            time_t date = expression->longNumber();
+            time_t date = expression->dateNumber();
             tm * timeinfo = localtime(&date);
             return mailimap_search_key_new_senton(mailimap_date_new(timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year));
         }
         case IMAPSearchKindSinceDate:
         {
-            time_t date = expression->longNumber();
+            time_t date = expression->dateNumber();
             tm * timeinfo = localtime(&date);
             return mailimap_search_key_new_sentsince(mailimap_date_new(timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year));
         }
         case IMAPSearchKindBeforeRecievedDate:
         {
-            time_t date = expression->longNumber();
+            time_t date = expression->dateNumber();
             tm * timeinfo = localtime(&date);
             return mailimap_search_key_new_before(mailimap_date_new(timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year));
         }
         case IMAPSearchKindOnRecievedDate:
         {
-            time_t date = expression->longNumber();
+            time_t date = expression->dateNumber();
             tm * timeinfo = localtime(&date);
             return mailimap_search_key_new_on(mailimap_date_new(timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year));
         }
         case IMAPSearchKindSinceRecievedDate:
         {
-            time_t date = expression->longNumber();
+            time_t date = expression->dateNumber();
             tm * timeinfo = localtime(&date);
             return mailimap_search_key_new_since(mailimap_date_new(timeinfo->tm_mday, timeinfo->tm_mon, timeinfo->tm_year));
         }