[QgsQuick] Datetime widget - spelling and banned keywords fix

vsklencar · wonder-sk · commit 4e6acb6da35f · 2020-09-11T13:45:12.000+02:00
diff --git a/src/quickgui/plugin/editor/qgsquickdatetime.qml b/src/quickgui/plugin/editor/qgsquickdatetime.qml
@@ -91,7 +91,7 @@ Item {
                             // if the field is a QDate, the automatic conversion to JS date [1]
                             // leads to the creation of date time object with the time zone.
                             // For instance shapefiles has support for dates but not date/time or time.
-                            // So a date coming from a shapefile as 2001-01-01 will become 2000-12-31 19:00:00 -05 in QML/JS (in the carribeans).
+                            // So a date coming from a shapefile as 2001-01-01 will become 2000-12-31 19:00:00 -05 in QML/JS in UTC -05 zone.
                             // And when formatting this with the display format, this is shown as 2000-12-31.
                             // So we detect if the field is a date only and revert the time zone offset.
                             // [1] http://doc.qt.io/qt-5/qtqml-cppintegration-data.html#basic-qt-data-types
diff --git a/src/quickgui/qgsquickutils.cpp b/src/quickgui/qgsquickutils.cpp
@@ -393,19 +393,19 @@ QString QgsQuickUtils::dateTimeFieldFormat( const QString &fieldFormat )
 {
   if ( QgsDateTimeFieldFormatter::DATE_FORMAT == fieldFormat )
   {
-    return QStringLiteral( "Date" );
+    return QString( "Date" );
   }
   else if ( QgsDateTimeFieldFormatter::TIME_FORMAT == fieldFormat )
   {
-    return QStringLiteral( "Time" );
+    return QString( "Time" );
   }
   else if ( QgsDateTimeFieldFormatter::DATETIME_FORMAT == fieldFormat )
   {
-    return QStringLiteral( "Date Time" );
+    return QString( "Date Time" );
   }
   else
   {
-    return QStringLiteral();
+    return QString();
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -393,19 +393,19 @@ QString QgsQuickUtils::dateTimeFieldFormat( const QString &fieldFormat )`
`393`	`393`	`{`
`394`	`394`	`if ( QgsDateTimeFieldFormatter::DATE_FORMAT == fieldFormat )`
`395`	`395`	`{`
`396`		`- return QStringLiteral( "Date" );`
	`396`	`+ return QString( "Date" );`
`397`	`397`	`}`
`398`	`398`	`else if ( QgsDateTimeFieldFormatter::TIME_FORMAT == fieldFormat )`
`399`	`399`	`{`
`400`		`- return QStringLiteral( "Time" );`
	`400`	`+ return QString( "Time" );`
`401`	`401`	`}`
`402`	`402`	`else if ( QgsDateTimeFieldFormatter::DATETIME_FORMAT == fieldFormat )`
`403`	`403`	`{`
`404`		`- return QStringLiteral( "Date Time" );`
	`404`	`+ return QString( "Date Time" );`
`405`	`405`	`}`
`406`	`406`	`else`
`407`	`407`	`{`
`408`		`- return QStringLiteral();`
	`408`	`+ return QString();`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`