Skip to content

Commit

Permalink
Remove unrequired ;
Browse files Browse the repository at this point in the history 
and make clang-tidy a bit more smiley
  • Loading branch information
@m-kuhn
m-kuhn committed May 15, 2019
1 parent 5844a0f commit 4d6fbd3
Show file tree
Hide file tree
Showing 528 changed files with 1,440 additions and 1,440 deletions.
2 changes: 1 addition & 1 deletion src/3d/chunks/qgschunknode_p.cpp
View file
Expand Up @@ -62,7 +62,7 @@ bool QgsChunkNode::allChildChunksResident( QTime currentTime ) const
return false; // not even a skeleton
if ( mChildren[i]->mHasData && !mChildren[i]->mEntity )
return false; // no there yet
Q_UNUSED( currentTime ); // seems we do not need this extra time (it just brings extra problems)
Q_UNUSED( currentTime ) // seems we do not need this extra time (it just brings extra problems)
//if (children[i]->entityCreatedTime.msecsTo(currentTime) < 100)
// return false; // allow some time for upload of stuff within Qt3D (TODO: better way to check it is ready?)
}
Expand Down
2 changes: 1 addition & 1 deletion src/3d/processing/qgsalgorithmtessellate.cpp
View file
Expand Up @@ -58,7 +58,7 @@ QgsProcessing::SourceType QgsTessellateAlgorithm::outputLayerType() const

QgsWkbTypes::Type QgsTessellateAlgorithm::outputWkbType( QgsWkbTypes::Type inputWkbType ) const
{
Q_UNUSED( inputWkbType );
Q_UNUSED( inputWkbType )
return QgsWkbTypes::MultiPolygonZ;
}

Expand Down
8 changes: 4 additions & 4 deletions src/3d/qgscameracontroller.cpp
View file
Expand Up @@ -170,7 +170,7 @@ void QgsCameraController::rotateCamera( float diffPitch, float diffYaw )

void QgsCameraController::frameTriggered( float dt )
{
Q_UNUSED( dt );
Q_UNUSED( dt )
}

void QgsCameraController::resetView( float distance )
Expand Down Expand Up @@ -348,13 +348,13 @@ void QgsCameraController::onWheel( Qt3DInput::QWheelEvent *wheel )

void QgsCameraController::onMousePressed( Qt3DInput::QMouseEvent *mouse )
{
Q_UNUSED( mouse );
Q_UNUSED( mouse )
mKeyboardHandler->setFocus( true );
}

void QgsCameraController::onMouseReleased( Qt3DInput::QMouseEvent *mouse )
{
Q_UNUSED( mouse );
Q_UNUSED( mouse )
}

void QgsCameraController::onKeyPressed( Qt3DInput::QKeyEvent *event )
Expand Down Expand Up @@ -439,7 +439,7 @@ void QgsCameraController::onKeyPressed( Qt3DInput::QKeyEvent *event )

void QgsCameraController::onKeyReleased( Qt3DInput::QKeyEvent *event )
{
Q_UNUSED( event );
Q_UNUSED( event )
}

void QgsCameraController::onPickerMousePressed( Qt3DRender::QPickEvent *pick )
Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgslayoutitem3dmap.cpp
View file
Expand Up @@ -209,7 +209,7 @@ bool QgsLayoutItem3DMap::writePropertiesToElement( QDomElement &element, QDomDoc

bool QgsLayoutItem3DMap::readPropertiesFromElement( const QDomElement &element, const QDomDocument &document, const QgsReadWriteContext &context )
{
Q_UNUSED( document );
Q_UNUSED( document )
QDomElement elemSettings = element.firstChildElement( QStringLiteral( "qgis3d" ) );
if ( !elemSettings.isNull() )
{
Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgsoffscreen3dengine.cpp
View file
Expand Up @@ -122,7 +122,7 @@ void QgsOffscreen3DEngine::setClearColor( const QColor &color )
void QgsOffscreen3DEngine::setFrustumCullingEnabled( bool enabled )
{
// TODO
Q_UNUSED( enabled );
Q_UNUSED( enabled )
}

void QgsOffscreen3DEngine::createRenderTarget()
Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgsrulebased3drenderer.cpp
View file
Expand Up @@ -461,7 +461,7 @@ void QgsRuleBased3DRenderer::writeXml( QDomElement &elem, const QgsReadWriteCont

void QgsRuleBased3DRenderer::readXml( const QDomElement &elem, const QgsReadWriteContext &context )
{
Q_UNUSED( context );
Q_UNUSED( context )
mLayerRef = QgsMapLayerRef( elem.attribute( QStringLiteral( "layer" ) ) );

// root rule is read before class constructed
Expand Down
4 changes: 2 additions & 2 deletions src/3d/symbols/qgsline3dsymbol.cpp
View file
Expand Up @@ -24,7 +24,7 @@ QgsAbstract3DSymbol *QgsLine3DSymbol::clone() const

void QgsLine3DSymbol::writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const
{
Q_UNUSED( context );
Q_UNUSED( context )

QDomDocument doc = elem.ownerDocument();

Expand All @@ -44,7 +44,7 @@ void QgsLine3DSymbol::writeXml( QDomElement &elem, const QgsReadWriteContext &co

void QgsLine3DSymbol::readXml( const QDomElement &elem, const QgsReadWriteContext &context )
{
Q_UNUSED( context );
Q_UNUSED( context )

QDomElement elemDataProperties = elem.firstChildElement( QStringLiteral( "data" ) );
mAltClamping = Qgs3DUtils::altClampingFromString( elemDataProperties.attribute( QStringLiteral( "alt-clamping" ) ) );
Expand Down
12 changes: 6 additions & 6 deletions src/3d/symbols/qgsline3dsymbol_p.cpp
View file
Expand Up @@ -87,8 +87,8 @@ class QgsBufferedLine3DSymbolHandler : public QgsFeature3DHandler

bool QgsBufferedLine3DSymbolHandler::prepare( const Qgs3DRenderContext &context, QSet<QString> &attributeNames )
{
Q_UNUSED( context );
Q_UNUSED( attributeNames );
Q_UNUSED( context )
Q_UNUSED( attributeNames )
return true;
}

Expand Down Expand Up @@ -213,7 +213,7 @@ class QgsSimpleLine3DSymbolHandler : public QgsFeature3DHandler

bool QgsSimpleLine3DSymbolHandler::prepare( const Qgs3DRenderContext &context, QSet<QString> &attributeNames )
{
Q_UNUSED( attributeNames );
Q_UNUSED( attributeNames )

outNormal.init( mSymbol.altitudeClamping(), mSymbol.altitudeBinding(), mSymbol.height(), &context.map() );
outSelected.init( mSymbol.altitudeClamping(), mSymbol.altitudeBinding(), mSymbol.height(), &context.map() );
Expand All @@ -223,7 +223,7 @@ bool QgsSimpleLine3DSymbolHandler::prepare( const Qgs3DRenderContext &context, Q

void QgsSimpleLine3DSymbolHandler::processFeature( QgsFeature &f, const Qgs3DRenderContext &context )
{
Q_UNUSED( context );
Q_UNUSED( context )
if ( f.geometry().isNull() )
return;

Expand Down Expand Up @@ -323,7 +323,7 @@ class QgsThickLine3DSymbolHandler : public QgsFeature3DHandler

bool QgsThickLine3DSymbolHandler::prepare( const Qgs3DRenderContext &context, QSet<QString> &attributeNames )
{
Q_UNUSED( attributeNames );
Q_UNUSED( attributeNames )

outNormal.withAdjacency = true;
outSelected.withAdjacency = true;
Expand All @@ -335,7 +335,7 @@ bool QgsThickLine3DSymbolHandler::prepare( const Qgs3DRenderContext &context, QS

void QgsThickLine3DSymbolHandler::processFeature( QgsFeature &f, const Qgs3DRenderContext &context )
{
Q_UNUSED( context );
Q_UNUSED( context )
if ( f.geometry().isNull() )
return;

Expand Down
4 changes: 2 additions & 2 deletions src/3d/symbols/qgsmesh3dsymbol.cpp
View file
Expand Up @@ -24,7 +24,7 @@ QgsAbstract3DSymbol *QgsMesh3DSymbol::clone() const

void QgsMesh3DSymbol::writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const
{
Q_UNUSED( context );
Q_UNUSED( context )

QDomDocument doc = elem.ownerDocument();

Expand All @@ -45,7 +45,7 @@ void QgsMesh3DSymbol::writeXml( QDomElement &elem, const QgsReadWriteContext &co

void QgsMesh3DSymbol::readXml( const QDomElement &elem, const QgsReadWriteContext &context )
{
Q_UNUSED( context );
Q_UNUSED( context )

QDomElement elemDataProperties = elem.firstChildElement( QStringLiteral( "data" ) );
mAltClamping = Qgs3DUtils::altClampingFromString( elemDataProperties.attribute( QStringLiteral( "alt-clamping" ) ) );
Expand Down
10 changes: 5 additions & 5 deletions src/3d/symbols/qgspoint3dsymbol_p.cpp
View file
Expand Up @@ -90,8 +90,8 @@ class QgsInstancedPoint3DSymbolHandler : public QgsFeature3DHandler

bool QgsInstancedPoint3DSymbolHandler::prepare( const Qgs3DRenderContext &context, QSet<QString> &attributeNames )
{
Q_UNUSED( context );
Q_UNUSED( attributeNames );
Q_UNUSED( context )
Q_UNUSED( attributeNames )
return true;
}

Expand Down Expand Up @@ -362,8 +362,8 @@ class QgsModelPoint3DSymbolHandler : public QgsFeature3DHandler

bool QgsModelPoint3DSymbolHandler::prepare( const Qgs3DRenderContext &context, QSet<QString> &attributeNames )
{
Q_UNUSED( context );
Q_UNUSED( attributeNames );
Q_UNUSED( context )
Q_UNUSED( attributeNames )
return true;
}

Expand Down Expand Up @@ -406,7 +406,7 @@ void QgsModelPoint3DSymbolHandler::makeEntity( Qt3DCore::QEntity *parent, const

void QgsModelPoint3DSymbolHandler::addSceneEntities( const Qgs3DMapSettings &map, const QVector<QVector3D> &positions, const QgsPoint3DSymbol &symbol, Qt3DCore::QEntity *parent )
{
Q_UNUSED( map );
Q_UNUSED( map )
for ( const QVector3D &position : positions )
{
// build the entity
Expand Down
4 changes: 2 additions & 2 deletions src/3d/symbols/qgspolygon3dsymbol.cpp
View file
Expand Up @@ -25,7 +25,7 @@ QgsAbstract3DSymbol *QgsPolygon3DSymbol::clone() const

void QgsPolygon3DSymbol::writeXml( QDomElement &elem, const QgsReadWriteContext &context ) const
{
Q_UNUSED( context );
Q_UNUSED( context )

QDomDocument doc = elem.ownerDocument();

Expand Down Expand Up @@ -56,7 +56,7 @@ void QgsPolygon3DSymbol::writeXml( QDomElement &elem, const QgsReadWriteContext

void QgsPolygon3DSymbol::readXml( const QDomElement &elem, const QgsReadWriteContext &context )
{
Q_UNUSED( context );
Q_UNUSED( context )

QDomElement elemDataProperties = elem.firstChildElement( QStringLiteral( "data" ) );
mAltClamping = Qgs3DUtils::altClampingFromString( elemDataProperties.attribute( QStringLiteral( "alt-clamping" ) ) );
Expand Down
2 changes: 1 addition & 1 deletion src/3d/terrain/qgsdemterraingenerator.cpp
View file
Expand Up @@ -65,7 +65,7 @@ QgsRectangle QgsDemTerrainGenerator::extent() const

float QgsDemTerrainGenerator::heightAt( double x, double y, const Qgs3DMapSettings &map ) const
{
Q_UNUSED( map );
Q_UNUSED( map )
if ( mHeightMapGenerator )
return mHeightMapGenerator->heightAt( x, y );
else
Expand Down
2 changes: 1 addition & 1 deletion src/3d/terrain/qgsonlineterraingenerator.cpp
View file
Expand Up @@ -50,7 +50,7 @@ QgsRectangle QgsOnlineTerrainGenerator::extent() const

float QgsOnlineTerrainGenerator::heightAt( double x, double y, const Qgs3DMapSettings &map ) const
{
Q_UNUSED( map );
Q_UNUSED( map )
if ( mHeightMapGenerator )
return mHeightMapGenerator->heightAt( x, y );
else
Expand Down
6 changes: 3 additions & 3 deletions src/3d/terrain/qgsterraingenerator.cpp
View file
Expand Up @@ -50,9 +50,9 @@ void QgsTerrainGenerator::rootChunkHeightRange( float &hMin, float &hMax ) const

float QgsTerrainGenerator::heightAt( double x, double y, const Qgs3DMapSettings &map ) const
{
Q_UNUSED( x );
Q_UNUSED( y );
Q_UNUSED( map );
Q_UNUSED( x )
Q_UNUSED( y )
Q_UNUSED( map )
return 0.f;
}

Expand Down
2 changes: 1 addition & 1 deletion src/3d/terrain/qgsterraingenerator.h
View file
Expand Up @@ -82,7 +82,7 @@ class _3D_EXPORT QgsTerrainGenerator : public QgsChunkLoaderFactory
virtual void readXml( const QDomElement &elem ) = 0;

//! After read of XML, resolve references to any layers that have been read as layer IDs
virtual void resolveReferences( const QgsProject &project ) { Q_UNUSED( project ); }
virtual void resolveReferences( const QgsProject &project ) { Q_UNUSED( project ) }

//! Converts terrain generator type enumeration into a string
static QString typeToString( Type type );
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/interpolation/Bezier3D.h
View file
Expand Up @@ -81,13 +81,13 @@ inline Bezier3D::Bezier3D( ParametricLine *parent, QVector<QgsPoint *> *controlp

inline void Bezier3D::add( ParametricLine *pl )
{
Q_UNUSED( pl );
Q_UNUSED( pl )
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve can not be parent of a ParametricLine." ) );
}

inline void Bezier3D::remove( int i )
{
Q_UNUSED( i );
Q_UNUSED( i )
QgsDebugMsg( QStringLiteral( "Error!!!!! A Bezier-curve has no children to remove." ) );
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/interpolation/DualEdgeTriangulation.cpp
View file
Expand Up @@ -1654,7 +1654,7 @@ void DualEdgeTriangulation::ruppertRefinement()
{
//split segment
int pointno = splitHalfEdge( i, 0.5 );
Q_UNUSED( pointno );
Q_UNUSED( pointno )
stop = false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/interpolation/MathUtils.cpp
View file
Expand Up @@ -49,7 +49,7 @@ bool MathUtils::calcBarycentricCoordinates( double x, double y, QgsPoint *p1, Qg

bool MathUtils::BarycentricToXY( double u, double v, double w, QgsPoint *p1, QgsPoint *p2, QgsPoint *p3, QgsPoint *result )//this is wrong at the moment. Furthermore, the case, where the denominators are 0 have to be treated (two ways of calculating px and py)
{
Q_UNUSED( w );
Q_UNUSED( w )

double px, py;
if ( p1 && p2 && p3 && result )
Expand Down
22 changes: 11 additions & 11 deletions src/analysis/interpolation/ParametricLine.cpp
View file
Expand Up @@ -19,28 +19,28 @@

void ParametricLine::add( ParametricLine *pl )
{
Q_UNUSED( pl );
Q_UNUSED( pl )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}

void ParametricLine::calcFirstDer( float t, Vector3D *v )
{
Q_UNUSED( t );
Q_UNUSED( v );
Q_UNUSED( t )
Q_UNUSED( v )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}

void ParametricLine::calcSecDer( float t, Vector3D *v )
{
Q_UNUSED( t );
Q_UNUSED( v );
Q_UNUSED( t )
Q_UNUSED( v )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}

void ParametricLine::calcPoint( float t, QgsPoint *p )
{
Q_UNUSED( t );
Q_UNUSED( p );
Q_UNUSED( t )
Q_UNUSED( p )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}

Expand All @@ -52,19 +52,19 @@ ParametricLine *ParametricLine::getParent() const

void ParametricLine::remove( int i )
{
Q_UNUSED( i );
Q_UNUSED( i )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}

void ParametricLine::setControlPoly( QVector<QgsPoint *> *cp )
{
Q_UNUSED( cp );
Q_UNUSED( cp )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}

void ParametricLine::setParent( ParametricLine *paral )
{
Q_UNUSED( paral );
Q_UNUSED( paral )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
}

Expand All @@ -76,7 +76,7 @@ int ParametricLine::getDegree() const

const QgsPoint *ParametricLine::getControlPoint( int number ) const
{
Q_UNUSED( number );
Q_UNUSED( number )
QgsDebugMsg( QStringLiteral( "warning, derive a class from ParametricLine" ) );
return nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/mesh/qgsmeshcalcparser.yy
View file
Expand Up @@ -117,7 +117,7 @@ void addToTmpNodes(QgsMeshCalcNode* node)
void removeTmpNode(QgsMeshCalcNode* node)
{
bool res;
Q_UNUSED(res);
Q_UNUSED(res)

if (node)
{
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/mesh/qgsmeshcalculator.cpp
View file
Expand Up @@ -77,7 +77,7 @@ QgsMeshCalculator::Result QgsMeshCalculator::expression_valid( const QString &fo

QgsMeshCalculator::Result QgsMeshCalculator::processCalculation( QgsFeedback *feedback )
{
Q_UNUSED( feedback );
Q_UNUSED( feedback )

// check input
if ( mOutputFile.isEmpty() )
Expand Down
14 changes: 7 additions & 7 deletions src/analysis/network/qgsgraphbuilderinterface.cpp
View file
Expand Up @@ -29,17 +29,17 @@ QgsGraphBuilderInterface::QgsGraphBuilderInterface( const QgsCoordinateReference

void QgsGraphBuilderInterface::addVertex( int id, const QgsPointXY &pt )
{
Q_UNUSED( id );
Q_UNUSED( pt );
Q_UNUSED( id )
Q_UNUSED( pt )
}

void QgsGraphBuilderInterface::addEdge( int pt1id, const QgsPointXY &pt1,
int pt2id, const QgsPointXY &pt2,
const QVector<QVariant> &strategies )
{
Q_UNUSED( pt1id );
Q_UNUSED( pt1 );
Q_UNUSED( pt2id );
Q_UNUSED( pt2 );
Q_UNUSED( strategies );
Q_UNUSED( pt1id )
Q_UNUSED( pt1 )
Q_UNUSED( pt2id )
Q_UNUSED( pt2 )
Q_UNUSED( strategies )
}

0 comments on commit 4d6fbd3

Please sign in to comment.