diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-12-15 10:42:27 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-06-20 09:54:19 +0000 |
| commit | e2eafc0c271e44fd9e8969b003e7f8ecd57cd2e6 (patch) | |
| tree | 4902e75eb9ad1d0c69eb85311daa2ff4cb88c2d3 /src/corelib/tools/qdatetimeparser.cpp | |
| parent | 68f19fb630dc02463c2d61fc511de7407687795e (diff) | |
QDateTimeParser: consolidate #if-ery around QT_NO_DATESTRING
Some private methods were conditioned on QT_NO_TEXTDATE but called
(without #if-ery) by methods conditioned on QT_NO_DATESTRING; and
various private methods without #if-ery were only called by methods
within. Consolidate to #if methods all on QT_NO_DATESTRING.
Change-Id: I1dd18037e4e7407c07041036cc5b871b7d693016
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qdatetimeparser.cpp')
| -rw-r--r-- | src/corelib/tools/qdatetimeparser.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/tools/qdatetimeparser.cpp index 4ea6f8764f..b81956a381 100644 --- a/src/corelib/tools/qdatetimeparser.cpp +++ b/src/corelib/tools/qdatetimeparser.cpp @@ -719,7 +719,7 @@ QString QDateTimeParser::sectionText(int sectionIndex) const } -#ifndef QT_NO_TEXTDATE +#ifndef QT_NO_DATESTRING /*! \internal:skipToNextSection @@ -908,9 +908,7 @@ int QDateTimeParser::parseSection(const QDateTime ¤tValue, int sectionInde return (state != Invalid ? num : -1); } -#endif // QT_NO_TEXTDATE -#ifndef QT_NO_DATESTRING /*! \internal @@ -1500,9 +1498,6 @@ end: text = input; return node; } -#endif // QT_NO_DATESTRING - -#ifndef QT_NO_TEXTDATE /* \internal @@ -1590,7 +1585,6 @@ int QDateTimeParser::findDay(const QString &str1, int startDay, int sectionIndex const int index = findTextEntry(str1, daysOfWeek, usedDay, used); return index < 0 ? index : index + startDay; } -#endif // QT_NO_TEXTDATE /*! \internal @@ -1736,6 +1730,7 @@ QDateTimeParser::AmPmFinder QDateTimeParser::findAmPm(QString &str, int sectionI return PossibleBoth; return (!broken[amindex] ? PossibleAM : PossiblePM); } +#endif // QT_NO_DATESTRING /*! \internal |