diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-14 14:48:37 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-09-22 19:08:53 +0200 |
| commit | df276fb29fc85e5ae6a552e9d8e8da6509425102 (patch) | |
| tree | 9fa04659ecb48acde11f754f99d355999b96e125 | |
| parent | a3bd80c08cd046d892c666098093ec20fc9e1321 (diff) | |
Inline various date-time fromString(const QString &...) methods
As requested in code-review.
Task-number: QTBUG-86400
Change-Id: I14e051e4bad3e8e227c6401e699f979663ffd10f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/corelib/time/qdatetime.cpp | 23 | ||||
| -rw-r--r-- | src/corelib/time/qdatetime.h | 9 |
2 files changed, 6 insertions, 26 deletions
diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 1263353ee1..f51411f45b 100644 --- a/src/corelib/time/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -1138,14 +1138,6 @@ QString QDate::toString(QStringView format, QCalendar cal) const { return QLocale::c().toString(*this, format, cal); } - -#if QT_STRINGVIEW_LEVEL < 2 -QString QDate::toString(const QString &format, QCalendar cal) const -{ - return toString(qToStringViewIgnoringNull(format), cal); -} -#endif - #endif // datestring /*! @@ -1916,14 +1908,6 @@ QString QTime::toString(QStringView format) const { return QLocale::c().toString(*this, format); } - -#if QT_STRINGVIEW_VERSION < 2 -QString QTime::toString(const QString &format) const -{ - return toString(qToStringViewIgnoringNull(format)); -} -#endif - #endif // datestring /*! @@ -4034,13 +4018,6 @@ QString QDateTime::toString(QStringView format, QCalendar cal) const { return QLocale::c().toString(*this, format, cal); } - -# if QT_STRINGVIEW_LEVEL < 2 -QString QDateTime::toString(const QString &format, QCalendar cal) const -{ - return toString(qToStringViewIgnoringNull(format), cal); -} -# endif #endif // datestring static inline void massageAdjustedDateTime(QDateTimeData &d, QDate date, QTime time) diff --git a/src/corelib/time/qdatetime.h b/src/corelib/time/qdatetime.h index e22fd79b4f..f35da36e30 100644 --- a/src/corelib/time/qdatetime.h +++ b/src/corelib/time/qdatetime.h @@ -99,7 +99,8 @@ public: #if QT_CONFIG(datestring) QString toString(Qt::DateFormat format = Qt::TextDate) const; # if QT_STRINGVIEW_LEVEL < 2 - QString toString(const QString &format, QCalendar cal = QCalendar()) const; + QString toString(const QString &format, QCalendar cal = QCalendar()) const + { return toString(qToStringViewIgnoringNull(format), cal); } # endif QString toString(QStringView format, QCalendar cal = QCalendar()) const; #endif @@ -175,7 +176,8 @@ public: #if QT_CONFIG(datestring) QString toString(Qt::DateFormat f = Qt::TextDate) const; #if QT_STRINGVIEW_LEVEL < 2 - QString toString(const QString &format) const; + QString toString(const QString &format) const + { return toString(qToStringViewIgnoringNull(format)); } #endif QString toString(QStringView format) const; #endif @@ -303,7 +305,8 @@ public: #if QT_CONFIG(datestring) QString toString(Qt::DateFormat format = Qt::TextDate) const; # if QT_STRINGVIEW_LEVEL < 2 - QString toString(const QString &format, QCalendar cal = QCalendar()) const; + QString toString(const QString &format, QCalendar cal = QCalendar()) const + { return toString(qToStringViewIgnoringNull(format), cal); } # endif QString toString(QStringView format, QCalendar cal = QCalendar()) const; #endif |