From 7b46ec16017d5b467b2b04e9d7e27ce1cee8659e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Tue, 28 Jun 2011 23:19:29 +0200
Subject: remove QT3_SUPPORT from corelib/tools

Change-Id: Ie224cf992be675c7d405d4be05e4acd4157e590e
Reviewed-on: http://codereview.qt.nokia.com/863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
---
 src/corelib/tools/qdatetime.h | 48 -------------------------------------------
 1 file changed, 48 deletions(-)

(limited to 'src/corelib/tools/qdatetime.h')

diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index be14df7841..62bdcab7cc 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -76,10 +76,6 @@ public:
     int weekNumber(int *yearNum = 0) const;
 
 #ifndef QT_NO_TEXTDATE
-#ifdef QT3_SUPPORT
-    static QT3_SUPPORT QString monthName(int month) { return shortMonthName(month); }
-    static QT3_SUPPORT QString dayName(int weekday) { return shortDayName(weekday); }
-#endif
     // ### Qt 5: merge these functions.
     static QString shortMonthName(int month);
     static QString shortMonthName(int month, MonthNameType type);
@@ -118,18 +114,11 @@ public:
 #endif
     static bool isValid(int y, int m, int d);
     static bool isLeapYear(int year);
-#ifdef QT3_SUPPORT
-    inline static QT3_SUPPORT bool leapYear(int year) { return isLeapYear(year); }
-#endif
 
     // ### Qt 5: remove these two functions
     static uint gregorianToJulian(int y, int m, int d);
     static void julianToGregorian(uint jd, int &y, int &m, int &d);
 
-#ifdef QT3_SUPPORT
-    static QT3_SUPPORT QDate currentDate(Qt::TimeSpec spec);
-#endif
-
     static inline QDate fromJulianDay(int jd) { QDate d; d.jd = jd; return d; }
     inline int toJulianDay() const { return jd; }
 
@@ -187,10 +176,6 @@ public:
 #endif
     static bool isValid(int h, int m, int s, int ms = 0);
 
-#ifdef QT3_SUPPORT
-    static QT3_SUPPORT QTime currentTime(Qt::TimeSpec spec);
-#endif
-
     void start();
     int restart();
     int elapsed() const;
@@ -273,21 +258,6 @@ public:
     static QDateTime fromMSecsSinceEpoch(qint64 msecs);
     static qint64 currentMSecsSinceEpoch();
 
-#ifdef QT3_SUPPORT
-    inline QT3_SUPPORT void setTime_t(uint secsSince1Jan1970UTC, Qt::TimeSpec spec) {
-        setTime_t(secsSince1Jan1970UTC);
-        if (spec == Qt::UTC)
-            *this = toUTC();
-    }
-    static inline QT3_SUPPORT QDateTime currentDateTime(Qt::TimeSpec spec) {
-        if (spec == Qt::LocalTime)
-            return currentDateTime();
-        else
-            return currentDateTime().toUTC();
-    }
-    
-#endif
-
 private:
     friend class QDateTimePrivate;
     void detach();
@@ -300,24 +270,6 @@ private:
 };
 Q_DECLARE_TYPEINFO(QDateTime, Q_MOVABLE_TYPE);
 
-#ifdef QT3_SUPPORT
-inline QDate QDate::currentDate(Qt::TimeSpec spec)
-{
-    if (spec == Qt::LocalTime)
-        return currentDate();
-    else
-        return QDateTime::currentDateTime().toUTC().date();
-}
-
-inline QTime QTime::currentTime(Qt::TimeSpec spec)
-{
-    if (spec == Qt::LocalTime)
-        return currentTime();
-    else
-        return QDateTime::currentDateTime().toUTC().time();
-}
-#endif
-
 #ifndef QT_NO_DATASTREAM
 Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QDate &);
 Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QDate &);
-- 
cgit v1.2.3