remove duplicate trailing ;

qgis · Sep 17, 2020 · 8ee86d0 · 8ee86d0
1 parent b3e7230
commit 8ee86d0
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/external/astyle/ASBeautifier.cpp b/external/astyle/ASBeautifier.cpp
@@ -3048,7 +3048,7 @@ void ASBeautifier::parseCurrentLine(const string& line)
 
 				isInHeader = true;
 
-				vector<const string*>* lastTempStack = nullptr;;
+				vector<const string*>* lastTempStack = nullptr;
 				if (!tempStacks->empty())
 					lastTempStack = tempStacks->back();
 

diff --git a/external/libdxfrw/drw_header.cpp b/external/libdxfrw/drw_header.cpp
@@ -2017,7 +2017,7 @@ bool DRW_Header::parseDwg( DRW::Version version, dwgBuffer *buf, dwgBuffer *hBbu
   if ( version < DRW::AC1015 )  //pre 2000
   {
     t = buf->getBitShort();
-    QgsDebugMsg( QString( "Unknown short (0): %1" ).arg( t ) );;
+    QgsDebugMsg( QString( "Unknown short (0): %1" ).arg( t ) );
   }
 
   if ( version < DRW::AC1018 )  //pre 2004

diff --git a/external/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp b/external/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
@@ -262,7 +262,7 @@ void QwtPolarSpectrogram::draw( QPainter *painter,
         QRectF r( 0, 0, 2 * radius, 2 * radius );
         r.moveCenter( pole );
 
-        clipRegion &= QRegion( r.toRect(), QRegion::Ellipse );;
+        clipRegion &= QRegion( r.toRect(), QRegion::Ellipse );
 
         imageRect &= r.toRect();
     }

diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -105,7 +105,7 @@ astyleit() {
 
 for f in "$@"; do
 	case "$f" in
-                src/plugins/grass/qtermwidget/*|external/o2/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/meshOptimizer/*|external/mapbox-vector-tile/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
+                src/plugins/grass/qtermwidget/*|external/qwt*|external/o2/*|external/qt-unix-signals/*|external/rtree/*|external/astyle/*|external/kdbush/*|external/poly2tri/*|external/wintoast/*|external/qt3dextra-headers/*|external/meshOptimizer/*|external/mapbox-vector-tile/*|python/ext-libs/*|ui_*.py|*.astyle|tests/testdata/*|editors/*)
 			echo -ne "$f skipped $elcr"
 			continue
 			;;

diff --git a/src/3d/qgs3dsceneexporter.cpp b/src/3d/qgs3dsceneexporter.cpp
@@ -312,7 +312,7 @@ QgsTerrainTileEntity *Qgs3DSceneExporter::getDemTerrainEntity( QgsTerrainEntity
 
 QgsTerrainTileEntity *Qgs3DSceneExporter::getMeshTerrainEntity( QgsTerrainEntity *terrain, QgsChunkNode *node )
 {
-  QgsMeshTerrainGenerator *generator = dynamic_cast<QgsMeshTerrainGenerator *>( terrain->map3D().terrainGenerator() );;
+  QgsMeshTerrainGenerator *generator = dynamic_cast<QgsMeshTerrainGenerator *>( terrain->map3D().terrainGenerator() );
   QgsMeshTerrainTileLoader *loader = qobject_cast<QgsMeshTerrainTileLoader *>( generator->createChunkLoader( node ) );
   // TODO: export textures
   QgsTerrainTileEntity *tileEntity = qobject_cast<QgsTerrainTileEntity *>( loader->createEntity( this ) );

diff --git a/src/analysis/interpolation/qgsdualedgetriangulation.cpp b/src/analysis/interpolation/qgsdualedgetriangulation.cpp
@@ -219,7 +219,7 @@ int QgsDualEdgeTriangulation::addPoint( const QgsPoint &p )
           int edgeFromPoint1ToVirtualSide2 = mHalfEdge[edgeFromNewPointToPoint1]->getNext();
           int edgeFromVirtualToPoint1Side1 = mHalfEdge[mHalfEdge[edgeFromNewPointToPoint2]->getNext()]->getNext();
           int edgeFromPoint2ToVirtualSide1 = mHalfEdge[edgeFromNewPointToPoint2]->getNext();
-          int edgeFromVirtualToPoint2Side2 = mHalfEdge[mHalfEdge[edgeFromNewPointToPoint1]->getNext()]->getNext();;
+          int edgeFromVirtualToPoint2Side2 = mHalfEdge[mHalfEdge[edgeFromNewPointToPoint1]->getNext()]->getNext();
           //insert new edges
           int edgeFromVirtualToNewPointSide1 = insertEdge( -10, edgeFromNewPointToPoint2, newPoint, false, false );
           int edgeFromNewPointToVirtualSide1 = insertEdge( edgeFromVirtualToNewPointSide1, edgeFromVirtualToPoint1Side1, -1, false, false );

diff --git a/src/app/locator/qgsinbuiltlocatorfilters.cpp b/src/app/locator/qgsinbuiltlocatorfilters.cpp
@@ -723,7 +723,7 @@ void QgsSettingsLocatorFilter::fetchResults( const QString &string, const QgsLoc
       continue;
     }
 
-    result.score = fuzzyScore( result.displayString, string );;
+    result.score = fuzzyScore( result.displayString, string );
 
     if ( result.score > 0 )
       emit resultFetched( result );

diff --git a/src/app/qgsmapsavedialog.cpp b/src/app/qgsmapsavedialog.cpp
@@ -302,7 +302,7 @@ bool QgsMapSaveDialog::saveWorldFile() const
 
 bool QgsMapSaveDialog::exportMetadata() const
 {
-  return mExportMetadataCheckBox->isChecked();;
+  return mExportMetadataCheckBox->isChecked();
 }
 
 bool QgsMapSaveDialog::saveAsRaster() const

diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp
@@ -121,7 +121,7 @@ QVariant QgsVertexEditorModel::data( const QModelIndex &index, int role ) const
     if ( calcR( index.row(), r, minRadius ) )
     {
       font.setItalic( true );
-      fontChanged = true;;
+      fontChanged = true;
     }
     if ( fontChanged )
     {

diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h
@@ -365,7 +365,7 @@ class CORE_EXPORT QgsRectangle
         mXmin = std::min( mXmin, rect.xMinimum() );
         mXmax = std::max( mXmax, rect.xMaximum() );
         mYmin = std::min( mYmin, rect.yMinimum() );
-        mYmax = std::max( mYmax, rect.yMaximum() );;
+        mYmax = std::max( mYmax, rect.yMaximum() );
       }
     }
 

diff --git a/src/core/processing/qgsprocessingparametertypeimpl.h b/src/core/processing/qgsprocessingparametertypeimpl.h
@@ -673,7 +673,7 @@ class CORE_EXPORT QgsProcessingParameterTypeExtent : public QgsProcessingParamet
              << QStringLiteral( "QgsProperty" )
              << QStringLiteral( "QgsRectangle" )
              << QStringLiteral( "QgsReferencedRectangle" )
-             << QStringLiteral( "QgsGeometry: bounding box of geometry is used" );;
+             << QStringLiteral( "QgsGeometry: bounding box of geometry is used" );
     }
 
     QStringList acceptedStringValues() const override

diff --git a/src/gui/layout/qgslayoutpdfexportoptionsdialog.cpp b/src/gui/layout/qgslayoutpdfexportoptionsdialog.cpp
@@ -148,7 +148,7 @@ void QgsLayoutPdfExportOptionsDialog::setGeoreferencingEnabled( bool enabled )
 
 bool QgsLayoutPdfExportOptionsDialog::georeferencingEnabled() const
 {
-  return mAppendGeoreferenceCheckbox->isChecked();;
+  return mAppendGeoreferenceCheckbox->isChecked();
 }
 
 void QgsLayoutPdfExportOptionsDialog::setMetadataEnabled( bool enabled )

diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp
@@ -423,7 +423,7 @@ void QgsGradientColorRampDialog::plotMousePress( QPointF point )
       currentDist = std::pow( point.x() - currentOff, 2.0 ) + std::pow( point.y() - currentCol.alphaF(), 2.0 );
       if ( currentDist < minDist )
       {
-        minDist = currentDist;;
+        minDist = currentDist;
         mCurrentPlotColorComponent = 3;
         mCurrentPlotMarkerIndex = i;
       }

diff --git a/src/gui/raster/qgspalettedrendererwidget.cpp b/src/gui/raster/qgspalettedrendererwidget.cpp
@@ -693,7 +693,7 @@ Qt::ItemFlags QgsPalettedRendererModel::flags( const QModelIndex &index ) const
       f = f | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled;
       break;
   }
-  return f | Qt::ItemIsEnabled | Qt::ItemIsSelectable;;
+  return f | Qt::ItemIsEnabled | Qt::ItemIsSelectable;
 }
 
 bool QgsPalettedRendererModel::removeRows( int row, int count, const QModelIndex &parent )

diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp
@@ -1908,7 +1908,7 @@ QString QgsGrass::findModule( QString module )
     const auto constPaths = paths;
     for ( const QString &path : constPaths )
     {
-      QString full = module + ext;;
+      QString full = module + ext;
       if ( !path.isEmpty() )
       {
         full.prepend( path + "/" );

diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp
@@ -470,7 +470,7 @@ namespace QgsWfs
   getFeatureRequest parseGetFeatureParameters( const QgsProject *project )
   {
     getFeatureRequest request;
-    request.maxFeatures = mWfsParameters.maxFeaturesAsInt();;
+    request.maxFeatures = mWfsParameters.maxFeaturesAsInt();
     request.startIndex = mWfsParameters.startIndexAsInt();
     request.outputFormat = mWfsParameters.outputFormat();
 
@@ -857,7 +857,7 @@ namespace QgsWfs
   getFeatureRequest parseGetFeatureRequestBody( QDomElement &docElem, const QgsProject *project )
   {
     getFeatureRequest request;
-    request.maxFeatures = mWfsParameters.maxFeaturesAsInt();;
+    request.maxFeatures = mWfsParameters.maxFeaturesAsInt();
     request.startIndex = mWfsParameters.startIndexAsInt();
     request.outputFormat = mWfsParameters.outputFormat();
 

diff --git a/tests/src/core/testqgscurve.cpp b/tests/src/core/testqgscurve.cpp
@@ -35,7 +35,7 @@ class TestQgsCurve : public QObject
     Q_OBJECT
 
   public:
-    TestQgsCurve() = default;;
+    TestQgsCurve() = default;
 
   private slots:
     //void initTestCase();// will be called before the first testfunction is executed.

diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -7509,7 +7509,7 @@ void TestQgsGeometry::triangle()
   // cast
   QgsTriangle pCast;
   QVERIFY( QgsPolygon().cast( &pCast ) );
-  QgsTriangle pCast2( QgsPoint( 7, 4 ), QgsPoint( 13, 3 ), QgsPoint( 9, 6 ) );;
+  QgsTriangle pCast2( QgsPoint( 7, 4 ), QgsPoint( 13, 3 ), QgsPoint( 9, 6 ) );
   QVERIFY( QgsPolygon().cast( &pCast2 ) );
 }
 

diff --git a/tests/src/core/testqgsproperty.cpp b/tests/src/core/testqgsproperty.cpp
@@ -358,7 +358,7 @@ void TestQgsProperty::staticProperty()
   p2.setTransformer( new TestTransformer( 10, 20 ) );
   // copy assign
   QgsProperty p3;
-  p3 = p2;;
+  p3 = p2;
   QVERIFY( p3.isActive() );
   QCOMPARE( p3.staticValue().toString(), QStringLiteral( "test" ) );
   QVERIFY( p3.transformer() );