Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_plot_glcanvas.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_plot_glcanvas.cpp (modified) (9 diffs)

trunk/BNC/qwt/qwt_plot_glcanvas.cpp

@@ -25 +25 @@
     for ( ; w->parentWidget() != NULL; w = w->parentWidget() )
     {
-        if ( w->autoFillBackground() || 
+        if ( w->autoFillBackground() ||
             w->testAttribute( Qt::WA_StyledBackground ) )
         {
@@ -66 +66 @@
 };
 
-/*! 
+/*!
   \brief Constructor
 
@@ -94 +94 @@
   Set the frame style
 
-  \param style The bitwise OR between a shape and a shadow. 
-  
-  \sa frameStyle(), QFrame::setFrameStyle(), 
+  \param style The bitwise OR between a shape and a shadow.
+
+  \sa frameStyle(), QFrame::setFrameStyle(),
       setFrameShadow(), setFrameShape()
  */
@@ -209 +209 @@
   \return Midline width of the frame
   \sa setMidLineWidth(), lineWidth()
- */ 
+ */
 int QwtPlotGLCanvas::midLineWidth() const
 {
@@ -279 +279 @@
 
   \sa QwtPlot::drawCanvas()
-*/  
+*/
 void QwtPlotGLCanvas::drawItems( QPainter *painter )
 {
@@ -296 +296 @@
   Draw the background of the canvas
   \param painter Painter
-*/ 
+*/
 void QwtPlotGLCanvas::drawBackground( QPainter *painter )
 {
@@ -316 +316 @@
         w->style()->drawPrimitive( QStyle::PE_Widget, &opt, painter, w);
     }
-    else 
+    else
     {
         painter->fillRect( fillRect,
@@ -337 +337 @@
     if ( frameShadow() == QwtPlotGLCanvas::Plain )
     {
-        qDrawPlainRect( painter, frameRect(), 
+        qDrawPlainRect( painter, frameRect(),
             palette().shadow().color(), lineWidth() );
     }
@@ -349 +349 @@
         else
         {
-            qDrawShadePanel( painter, frameRect(), palette(), 
+            qDrawShadePanel( painter, frameRect(), palette(),
                 frameShadow() == Sunken, lineWidth() );
         }