Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_date_scale_draw.cpp

Timestamp:

Mar 19, 2021, 9:15:03 AM (3 years ago)

Author:

stoecker

Message:

update to qwt verion 6.1.1 to fix build with newer Qt5

File:

• trunk/BNC/qwt/qwt_date_scale_draw.cpp (modified) (10 diffs)

trunk/BNC/qwt/qwt_date_scale_draw.cpp

@@ -37 +37 @@
   \brief Constructor
 
-  The default setting is to display tick labels for the 
+  The default setting is to display tick labels for the
   given time specification. The first week of a year is defined like
   for QwtDate::FirstThursday.
@@ -110 +110 @@
   \sa week0Type().
   \note week0Type has no effect beside for intervals classified as
-        QwtDate::Week. 
+        QwtDate::Week.
  */
 void QwtDateScaleDraw::setWeek0Type( QwtDate::Week0Type week0Type )
@@ -118 +118 @@
 
 /*!
-  \return Setting how to identify the first week of a year. 
+  \return Setting how to identify the first week of a year.
   \sa setWeek0Type()
  */
@@ -134 +134 @@
   \sa dateFormat(), dateFormatOfDate(), QwtDate::toString()
  */
-void QwtDateScaleDraw::setDateFormat( 
+void QwtDateScaleDraw::setDateFormat(
     QwtDate::IntervalType intervalType, const QString &format )
 {
-    if ( intervalType >= QwtDate::Millisecond && 
+    if ( intervalType >= QwtDate::Millisecond &&
         intervalType <= QwtDate::Year )
     {
@@ -149 +149 @@
   \sa setDateFormat(), dateFormatOfDate()
  */
-QString QwtDateScaleDraw::dateFormat( 
+QString QwtDateScaleDraw::dateFormat(
     QwtDate::IntervalType intervalType ) const
 {
-    if ( intervalType >= QwtDate::Millisecond && 
+    if ( intervalType >= QwtDate::Millisecond &&
         intervalType <= QwtDate::Year )
     {
@@ -158 +158 @@
     }
 
-    return QString::null;
+    return QString();
 }
 
@@ -182 +182 @@
     Q_UNUSED( dateTime )
 
-    if ( intervalType >= QwtDate::Millisecond && 
+    if ( intervalType >= QwtDate::Millisecond &&
         intervalType <= QwtDate::Year )
     {
@@ -205 +205 @@
 {
     const QDateTime dt = toDateTime( value );
-    const QString fmt = dateFormatOfDate( 
+    const QString fmt = dateFormatOfDate(
         dt, intervalType( scaleDiv() ) );
 
@@ -220 +220 @@
   \sa dateFormatOfDate()
  */
-QwtDate::IntervalType QwtDateScaleDraw::intervalType( 
+QwtDate::IntervalType QwtDateScaleDraw::intervalType(
     const QwtScaleDiv &scaleDiv ) const
 {
@@ -233 +233 @@
         for ( int j = QwtDate::Second; j <= intvType; j++ )
         {
-            const QDateTime dt0 = QwtDate::floor( dt, 
+            const QDateTime dt0 = QwtDate::floor( dt,
                 static_cast<QwtDate::IntervalType>( j ) );