Fix warning

qgis · Mar 22, 2019 · 6b470ee · 6b470ee
1 parent 427ea51
commit 6b470ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/3d/qgs3dmapcanvas.h b/src/app/3d/qgs3dmapcanvas.h
@@ -62,13 +62,13 @@ class Qgs3DMapCanvas : public QWidget
 
     /**
      * Sets the active map tool that will receive events from the 3D canvas. Does not transfer ownership.
-     * If the tool is null, events will be used for camera manipulation.
+     * If the tool is NULLPTR, events will be used for camera manipulation.
      */
     void setMapTool( Qgs3DMapTool *tool );
 
     /**
      * Returns the active map tool that will receive events from the 3D canvas.
-     * If the tool is null, events will be used for camera manipulation.
+     * If the tool is NULLPTR, events will be used for camera manipulation.
      */
     Qgs3DMapTool *mapTool() const { return mMapTool; }
 

diff --git a/src/core/symbology/qgslinesymbollayer.cpp b/src/core/symbology/qgslinesymbollayer.cpp
@@ -694,7 +694,7 @@ class MyLine
       else
       {
         mVertical = false;
-        mT = float( p2.y() - p1.y() ) / ( p2.x() - p1.x() );
+        mT = ( p2.y() - p1.y() ) / ( p2.x() - p1.x() );
         mIncreasing = ( p2.x() > p1.x() );
       }