From aca13a8ebab96d1806770e251034545a9abb27b5 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Wed, 15 May 2019 15:37:20 +0200
Subject: Tidy up in qdatetime.cpp

Break a line before a close-brace. Added blank lines. Remove some
duplicate blank lines and spurious \fn directives. Fixed placement of
& between type and parameter name in the function declarations that
made these last redundant (these are the WS-only changes).

Change-Id: I7ee06a7cbb4f9cb275d5ad87246d8fbc9c9b6668
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/corelib/tools/qdatetime.cpp | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index cc98f80feb..d50ab4a8f9 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -177,7 +177,8 @@ static const char monthDays[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30,
 #if QT_CONFIG(textdate)
 static const char qt_shortMonthNames[][4] = {
     "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+    "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+};
 
 static int qt_monthNumberFromShortName(QStringRef shortName)
 {
@@ -422,7 +423,6 @@ QDate::QDate(int y, int m, int d)
     \sa isValid()
 */
 
-
 /*!
     \fn bool QDate::isValid() const
 
@@ -431,7 +431,6 @@ QDate::QDate(int y, int m, int d)
     \sa isNull()
 */
 
-
 /*!
     Returns the year of this date. Negative numbers indicate years
     before 1 CE, such that year -44 is 44 BCE.
@@ -880,6 +879,7 @@ QDateTime QDate::endOfDay(const QTimeZone &zone) const
 #endif // timezone
 
 #if QT_DEPRECATED_SINCE(5, 11) && QT_CONFIG(textdate)
+
 /*!
     \since 4.5
     \deprecated
@@ -1475,8 +1475,6 @@ qint64 QDate::daysTo(const QDate &d) const
 
 #if QT_CONFIG(datestring)
 /*!
-    \fn QDate QDate::fromString(const QString &string, Qt::DateFormat format)
-
     Returns the QDate represented by the \a string, using the
     \a format given, or an invalid date if the string cannot be
     parsed.
@@ -1487,7 +1485,8 @@ qint64 QDate::daysTo(const QDate &d) const
 
     \sa toString(), QLocale::toDate()
 */
-QDate QDate::fromString(const QString& string, Qt::DateFormat format)
+
+QDate QDate::fromString(const QString &string, Qt::DateFormat format)
 {
     if (string.isEmpty())
         return QDate();
@@ -1544,8 +1543,6 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format)
 }
 
 /*!
-    \fn QDate QDate::fromString(const QString &string, const QString &format)
-
     Returns the QDate represented by the \a string, using the \a
     format given, or an invalid date if the string cannot be parsed.
 
@@ -2239,8 +2236,6 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format,
 }
 
 /*!
-    \fn QTime QTime::fromString(const QString &string, Qt::DateFormat format)
-
     Returns the time represented in the \a string as a QTime using the
     \a format given, or an invalid time if this is not possible.
 
@@ -2252,7 +2247,7 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format,
 
     \sa toString(), QLocale::toTime()
 */
-QTime QTime::fromString(const QString& string, Qt::DateFormat format)
+QTime QTime::fromString(const QString &string, Qt::DateFormat format)
 {
     if (string.isEmpty())
         return QTime();
@@ -2279,8 +2274,6 @@ QTime QTime::fromString(const QString& string, Qt::DateFormat format)
 }
 
 /*!
-    \fn QTime QTime::fromString(const QString &string, const QString &format)
-
     Returns the QTime represented by the \a string, using the \a
     format given, or an invalid time if the string cannot be parsed.
 
@@ -5000,8 +4993,6 @@ int QDateTime::utcOffset() const
 #if QT_CONFIG(datestring)
 
 /*!
-    \fn QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
-
     Returns the QDateTime represented by the \a string, using the
     \a format given, or an invalid datetime if this is not possible.
 
@@ -5011,7 +5002,7 @@ int QDateTime::utcOffset() const
 
     \sa toString(), QLocale::toDateTime()
 */
-QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
+QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format)
 {
     if (string.isEmpty())
         return QDateTime();
@@ -5218,8 +5209,6 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format)
 }
 
 /*!
-    \fn QDateTime QDateTime::fromString(const QString &string, const QString &format)
-
     Returns the QDateTime represented by the \a string, using the \a
     format given, or an invalid datetime if the string cannot be parsed.
 
-- 
cgit v1.2.3