diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index 3ce66f2e953a..5ab075d51b5e 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -240,7 +240,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
setTabPosition( Qt::AllDockWidgetAreas, QTabWidget::North );
mGeneralDock = new QDockWidget( tr( "Composition" ), this );
mGeneralDock->setObjectName( "CompositionDock" );
- mItemDock = new QDockWidget( tr( "Item Properties"), this );
+ mItemDock = new QDockWidget( tr( "Item Properties" ), this );
mItemDock->setObjectName( "ItemDock" );
mUndoDock = new QDockWidget( tr( "Command history" ), this );
mUndoDock->setObjectName( "CommandDock" );
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
index 448ab7e8faf7..b3651e6b197e 100644
--- a/src/core/composer/qgscomposermap.h
+++ b/src/core/composer/qgscomposermap.h
@@ -370,7 +370,7 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
void drawGrid( QPainter* p );
/**Draw coordinates for mGridAnnotationType Coordinate
@param p drawing painter
- @param hLines horizontal coordinate lines in item coordinates
+ @param hLines horizontal coordinate lines in item coordinates
@param vLines vertical coordinate lines in item coordinates*/
void drawCoordinateAnnotations( QPainter* p, const QList< QPair< double, QLineF > >& hLines, const QList< QPair< double, QLineF > >& vLines );
void drawCoordinateAnnotation( QPainter* p, const QPointF& pos, QString annotationString );
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
index 547f203b12ae..3d180b7aeea5 100644
--- a/src/core/pal/feature.cpp
+++ b/src/core/pal/feature.cpp
@@ -913,7 +913,7 @@ namespace pal
tmp = tmp->getNextPart();
}
- double angle_diff_avg = f->labelInfo->char_num > 1 ? (angle_diff / ( f->labelInfo->char_num - 1 )) : 0; // <0, pi> but pi/8 is much already
+ double angle_diff_avg = f->labelInfo->char_num > 1 ? ( angle_diff / ( f->labelInfo->char_num - 1 ) ) : 0; // <0, pi> but pi/8 is much already
double cost = angle_diff_avg / 100; // <0, 0.031 > but usually <0, 0.003 >
if ( cost < 0.0001 ) cost = 0.0001;
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
index bb8462cef980..bd4fcde3549b 100644
--- a/src/core/qgsdataitem.cpp
+++ b/src/core/qgsdataitem.cpp
@@ -150,14 +150,14 @@ const QIcon &QgsZipItem::iconZip()
QgsDataItem::QgsDataItem( QgsDataItem::Type type, QgsDataItem* parent, QString name, QString path )
- // Do not pass parent to QObject, Qt would delete this when parent is deleted
+// Do not pass parent to QObject, Qt would delete this when parent is deleted
: QObject(), mType( type ), mParent( parent ), mPopulated( false ), mName( name ), mPath( path )
{
}
-QgsDataItem::~QgsDataItem()
+QgsDataItem::~QgsDataItem()
{
- QgsDebugMsg( "mName = " + mName + " mPath = " + mPath);
+ QgsDebugMsg( "mName = " + mName + " mPath = " + mPath );
}
// TODO: This is copy from QgisApp, bad
@@ -297,14 +297,14 @@ QgsDataItem * QgsDataItem::removeChildItem( QgsDataItem * child )
mChildren.remove( i );
emit endRemoveItems();
disconnect( child, SIGNAL( beginInsertItems( QgsDataItem*, int, int ) ),
- this, SLOT( emitBeginInsertItems( QgsDataItem*, int, int ) ) );
+ this, SLOT( emitBeginInsertItems( QgsDataItem*, int, int ) ) );
disconnect( child, SIGNAL( endInsertItems() ),
- this, SLOT( emitEndInsertItems() ) );
+ this, SLOT( emitEndInsertItems() ) );
disconnect( child, SIGNAL( beginRemoveItems( QgsDataItem*, int, int ) ),
- this, SLOT( emitBeginRemoveItems( QgsDataItem*, int, int ) ) );
+ this, SLOT( emitBeginRemoveItems( QgsDataItem*, int, int ) ) );
disconnect( child, SIGNAL( endRemoveItems() ),
- this, SLOT( emitEndRemoveItems() ) );
- child->setParent(0);
+ this, SLOT( emitEndRemoveItems() ) );
+ child->setParent( 0 );
return child;
}
@@ -414,10 +414,10 @@ QgsDataCollectionItem::QgsDataCollectionItem( QgsDataItem* parent, QString name,
QgsDataCollectionItem::~QgsDataCollectionItem()
{
- QgsDebugMsg( "Entered");
+ QgsDebugMsg( "Entered" );
foreach( QgsDataItem* i, mChildren )
{
- QgsDebugMsg( QString("delete child = 0x%0").arg((qlonglong)i,8,16,QLatin1Char('0')) );
+ QgsDebugMsg( QString( "delete child = 0x%0" ).arg(( qlonglong )i, 8, 16, QLatin1Char( '0' ) ) );
delete i;
}
}
diff --git a/src/core/qgsmessageoutput.cpp b/src/core/qgsmessageoutput.cpp
index 34dc0c16d90e..0c0766b9c157 100644
--- a/src/core/qgsmessageoutput.cpp
+++ b/src/core/qgsmessageoutput.cpp
@@ -67,7 +67,7 @@ void QgsMessageOutputConsole::showMessage( bool )
{
mMessage.replace( "
", "\n" );
mMessage.replace( " ", " " );
- mMessage.replace( QRegExp("]+>"), "" );
+ mMessage.replace( QRegExp( "]+>" ), "" );
}
QgsMessageLog::logMessage( mMessage, mTitle.isNull() ? QObject::tr( "Console" ) : mTitle );
emit destroyed();
diff --git a/src/core/qgsowsconnection.h b/src/core/qgsowsconnection.h
index 15a7fe8a7480..46078941c1e2 100644
--- a/src/core/qgsowsconnection.h
+++ b/src/core/qgsowsconnection.h
@@ -47,6 +47,7 @@ class QgsOWSConnection : public QObject
/**
* Constructor
* @param theService service name: WMS,WFS,WCS
+ * @param theConnName connection name
*/
QgsOWSConnection( const QString & theService, const QString & theConnName );
//! Destructor
diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
index a6cf46e8ace1..672bf7462cf0 100644
--- a/src/core/raster/qgsrasterrenderer.h
+++ b/src/core/raster/qgsrasterrenderer.h
@@ -89,26 +89,42 @@ class CORE_EXPORT QgsRasterRenderer
inline double readValue( void *data, QgsRasterDataProvider::DataType type, int index );
/**Start reading of raster band. Raster data can then be retrieved by calling readNextRasterPart until it returns false.
- @param bandNumer number of raster band to read
+ @param bandNumber number of raster band to read
@param viewPort describes raster position on screen
+ @param mapToPixel transform map to pixel
@param oversamplingX out: oversampling rate in x-direction
@param oversamplingY out: oversampling rate in y-direction*/
void startRasterRead( int bandNumber, QgsRasterViewPort* viewPort, const QgsMapToPixel* mapToPixel, double& oversamplingX, double& oversamplingY );
/**Fetches next part of raster data
+ @param bandNumber number of raster band to read
+ @param oversamplingX oversampling rate in x-direction
+ @param oversamplingY oversampling rate in y-direction
+ @param viewPort view port
@param nCols number of columns on output device
@param nRows number of rows on output device
@param nColsRaster number of raster columns (different to nCols if oversamplingX != 1.0)
- @param nRowsRaster number of raster rows (different to nRows if oversamplingY != 0)*/
+ @param nRowsRaster number of raster rows (different to nRows if oversamplingY != 0)
+ @param rasterData raster data
+ @param topLeftCol Left position relative to left border of viewport
+ @param topLeftRow Top position relative to top border of viewport*/
bool readNextRasterPart( int bandNumber, double oversamplingX, double oversamplingY, QgsRasterViewPort* viewPort, int& nCols, int& nRows,
int& nColsRaster, int& nRowsRaster, void** rasterData, int& topLeftCol, int& topLeftRow );
/**Draws raster part
+ @param p the painter
+ @param viewPort view port
+ @param img image
@param topLeftCol Left position relative to left border of viewport
- @param topLeftRow Top position relative to top border of viewport*/
+ @param topLeftRow Top position relative to top border of viewport
+ @param nCols number of columns
+ @param nRows number of rows
+ @param oversamplingX oversampling rate in x-direction
+ @param oversamplingY oversampling rate in y-direction
+ */
void drawImage( QPainter* p, QgsRasterViewPort* viewPort, const QImage& img, int topLeftCol, int topLeftRow,
int nCols, int nRows, double oversamplingX, double oversamplingY ) const;
void stopRasterRead( int bandNumber );
- /**Write upper class info into element (called by writeXML method of subclasses)*/
+ /**Write upper class info into rasterrenderer element (called by writeXML method of subclasses)*/
void _writeXML( QDomDocument& doc, QDomElement& rasterRendererElem ) const;
diff --git a/src/core/raster/qgsrasterresampler.h b/src/core/raster/qgsrasterresampler.h
index 075b330aa638..446067b675db 100644
--- a/src/core/raster/qgsrasterresampler.h
+++ b/src/core/raster/qgsrasterresampler.h
@@ -26,6 +26,7 @@ class QImage;
class QgsRasterResampler
{
public:
+ virtual ~QgsRasterResampler() {}
virtual void resample( const QImage& srcImage, QImage& dstImage ) = 0;
virtual QString type() const = 0;
};
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
index 84799cd65110..3eda62613c76 100644
--- a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
+++ b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -828,8 +828,8 @@ void QgsRuleBasedRendererV2::refineRuleRanges( QgsRuleBasedRendererV2::Rule* ini
// TODO: have a possibility to construct expressions directly as a parse tree to avoid loss of precision
QString attr = QgsExpression::quotedColumnRef( r->classAttribute() );
QString filter = QString( "%1 >= %2 AND %1 <= %3" ).arg( attr )
- .arg( QString::number( rng.lowerValue(), 'f', 4 ) )
- .arg( QString::number( rng.upperValue(), 'f', 4 ) );
+ .arg( QString::number( rng.lowerValue(), 'f', 4 ) )
+ .arg( QString::number( rng.upperValue(), 'f', 4 ) );
QString label = filter;
initialRule->appendChild( new Rule( rng.symbol()->clone(), 0, 0, filter, label ) );
}
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
index afa0e1519038..34f4102b5a6c 100644
--- a/src/gui/attributetable/qgsattributetablemodel.cpp
+++ b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -168,7 +168,7 @@ void QgsAttributeTableModel::attributeDeleted( int idx )
{
QgsFeatureId fid = rowToId( row );
- if( !mFeatureMap.contains( fid ) )
+ if ( !mFeatureMap.contains( fid ) )
continue;
mFeatureMap[ fid ].deleteAttribute( idx );
diff --git a/src/gui/qgsowssourceselect.cpp b/src/gui/qgsowssourceselect.cpp
index ed2df5b26ae9..396efd5f2a40 100644
--- a/src/gui/qgsowssourceselect.cpp
+++ b/src/gui/qgsowssourceselect.cpp
@@ -379,7 +379,7 @@ void QgsOWSSourceSelect::addClicked()
QgsDebugMsg( "entered" );
}
-void QgsOWSSourceSelect::enableLayersForCrs( QTreeWidgetItem *item )
+void QgsOWSSourceSelect::enableLayersForCrs( QTreeWidgetItem * )
{
}
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
index ca5288b74c65..b47c86ef2bb6 100644
--- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp
+++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -1030,19 +1030,19 @@ void QgsGeorefPluginGui::setupConnections()
void QgsGeorefPluginGui::removeOldLayer()
{
- // delete layer (and don't signal it as it's our private layer)
- if ( mLayer )
- {
- QgsMapLayerRegistry::instance()->removeMapLayers(
- ( QStringList() << mLayer->id() ), false );
- mLayer = NULL;
- }
- mCanvas->refresh();
+ // delete layer (and don't signal it as it's our private layer)
+ if ( mLayer )
+ {
+ QgsMapLayerRegistry::instance()->removeMapLayers(
+ ( QStringList() << mLayer->id() ), false );
+ mLayer = NULL;
+ }
+ mCanvas->refresh();
}
void QgsGeorefPluginGui::updateIconTheme( QString theme )
{
- Q_UNUSED(theme);
+ Q_UNUSED( theme );
// File actions
mActionOpenRaster->setIcon( getThemeIcon( "/mActionOpenRaster.png" ) );
mActionStartGeoref->setIcon( getThemeIcon( "/mActionStartGeoref.png" ) );
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.h b/src/plugins/georeferencer/qgsgeorefplugingui.h
index 9705a271d20c..751632b1fbb9 100644
--- a/src/plugins/georeferencer/qgsgeorefplugingui.h
+++ b/src/plugins/georeferencer/qgsgeorefplugingui.h
@@ -114,7 +114,7 @@ class QgsGeorefPluginGui : public QMainWindow, private Ui::QgsGeorefPluginGuiBas
bool updateGeorefTransform();
- void updateIconTheme( QString theme);
+ void updateIconTheme( QString theme );
private:
enum SaveGCPs
diff --git a/src/providers/gdal/qgswcscapabilities.cpp b/src/providers/gdal/qgswcscapabilities.cpp
index 2c0ecb4c9757..387a88c8f153 100644
--- a/src/providers/gdal/qgswcscapabilities.cpp
+++ b/src/providers/gdal/qgswcscapabilities.cpp
@@ -501,6 +501,7 @@ void QgsWcsCapabilities::parseContentMetadata( QDomElement const & e, QgsWcsCove
void QgsWcsCapabilities::parseCoverageOfferingBrief( QDomElement const & e, QgsWcsCoverageSummary &coverageSummary, QgsWcsCoverageSummary *parent )
{
+ Q_UNUSED( parent );
QgsDebugMsg( "Entered" );
coverageSummary.orderId = ++mCoverageCount;
diff --git a/src/providers/gdal/qgswcssourceselect.cpp b/src/providers/gdal/qgswcssourceselect.cpp
index 3828a5d5dc0d..158597bcc135 100644
--- a/src/providers/gdal/qgswcssourceselect.cpp
+++ b/src/providers/gdal/qgswcssourceselect.cpp
@@ -233,7 +233,7 @@ QStringList QgsWCSSourceSelect::selectedLayersCRSs()
return c->supportedCrs;
}
-void QgsWCSSourceSelect::enableLayersForCrs( QTreeWidgetItem *item )
+void QgsWCSSourceSelect::enableLayersForCrs( QTreeWidgetItem * )
{
// TODO: I am not convinced to disable layers according to selected CRS
}
diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp
index 70125d5c613d..5e8384e15660 100644
--- a/src/providers/mssql/qgsmssqlprovider.cpp
+++ b/src/providers/mssql/qgsmssqlprovider.cpp
@@ -605,9 +605,9 @@ void QgsMssqlProvider::select( QgsAttributeList fetchAttributes,
if ( !mSqlWhereClause.isEmpty() )
{
if ( rect.isEmpty() )
- mStatement += " where (" + mSqlWhereClause + ")";
+ mStatement += " where (" + mSqlWhereClause + ")";
else
- mStatement += " and (" + mSqlWhereClause + ")";
+ mStatement += " and (" + mSqlWhereClause + ")";
}
mFetchGeom = fetchGeometry;
@@ -638,7 +638,7 @@ QVariant QgsMssqlProvider::minimumValue( int index )
.arg( fld.name() );
if ( !mSchemaName.isEmpty() )
- sql += "[" + mSchemaName + "].";
+ sql += "[" + mSchemaName + "].";
sql += "[" + mTableName + "]";
@@ -676,7 +676,7 @@ QVariant QgsMssqlProvider::maximumValue( int index )
.arg( fld.name() );
if ( !mSchemaName.isEmpty() )
- sql += "[" + mSchemaName + "].";
+ sql += "[" + mSchemaName + "].";
sql += "[" + mTableName + "]";
@@ -712,18 +712,18 @@ void QgsMssqlProvider::uniqueValues( int index, QList &uniqueValues, i
// get the field name
QgsField fld = mAttributeFields[ index ];
- QString sql = QString( "select distinct ");
-
- if (limit > 0)
+ QString sql = QString( "select distinct " );
+
+ if ( limit > 0 )
{
sql += QString( " top %1 " ).arg( limit );
}
sql += QString( "[%1] from " )
- .arg( fld.name() );
+ .arg( fld.name() );
if ( !mSchemaName.isEmpty() )
- sql += "[" + mSchemaName + "].";
+ sql += "[" + mSchemaName + "].";
sql += "[" + mTableName + "]";
diff --git a/src/providers/ows/qgsowsdataitems.cpp b/src/providers/ows/qgsowsdataitems.cpp
index 4e7cf82c9bb0..37910363a4ec 100644
--- a/src/providers/ows/qgsowsdataitems.cpp
+++ b/src/providers/ows/qgsowsdataitems.cpp
@@ -219,7 +219,7 @@ static QStringList wildcards = QStringList();
QGISEXTERN int dataCapabilities()
{
- return QgsDataProvider::Net;
+ return QgsDataProvider::Net;
}
QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
@@ -228,12 +228,13 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
{
return new QgsOWSRootItem( parentItem, "OWS", "ows:" );
}
-
+ return 0;
}
//QGISEXTERN QgsOWSSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
QGISEXTERN QDialog * selectWidget( QWidget * parent, Qt::WFlags fl )
{
+ Q_UNUSED( parent );
//return new QgsOWSSourceSelect( parent, fl );
return 0;
}
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
index c540bddc9d91..17c03f38232d 100644
--- a/src/providers/postgres/qgspostgresprovider.cpp
+++ b/src/providers/postgres/qgspostgresprovider.cpp
@@ -2872,7 +2872,7 @@ bool QgsPostgresProvider::getGeometryDetails()
mEnabledCapabilities &= ~( QgsVectorDataProvider::ChangeGeometries | QgsVectorDataProvider::AddFeatures );
}
- QgsDebugMsg( QString( "Feature type name is %1" ).arg( QGis::qgisFeatureTypes[ geometryType() ] ) );
+ QgsDebugMsg( QString( "Feature type name is %1" ).arg( QGis::qgisFeatureTypes[ geometryType()] ) );
QgsDebugMsg( QString( "Geometry is geography %1" ).arg( mIsGeography ) );
return mValid;
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
index 99de3195b779..166258f0e2c5 100644
--- a/src/providers/wfs/qgswfsdataitems.cpp
+++ b/src/providers/wfs/qgswfsdataitems.cpp
@@ -55,7 +55,7 @@ QVector QgsWFSConnectionItem::createChildren()
QString encodedUri = mPath;
QgsDataSourceURI uri;
- uri.setEncodedUri ( encodedUri );
+ uri.setEncodedUri( encodedUri );
QgsDebugMsg( "encodedUri = " + encodedUri );
mCapabilities = new QgsWFSCapabilities( encodedUri );
@@ -155,7 +155,7 @@ QVector QgsWFSRootItem::createChildren()
{
QgsOWSConnection connection( "WF", connName );
QgsDataItem * conn = new QgsWFSConnectionItem( this, connName, connection.uri().encodedUri() );
- conn->setIcon ( QIcon( getThemePixmap( "mIconConnect.png" ) ) );
+ conn->setIcon( QIcon( getThemePixmap( "mIconConnect.png" ) ) );
connections.append( conn );
}
return connections;
diff --git a/src/providers/wms/qgswmsconnection.cpp b/src/providers/wms/qgswmsconnection.cpp
index 92ebbd993a68..4d65fd1af12c 100644
--- a/src/providers/wms/qgswmsconnection.cpp
+++ b/src/providers/wms/qgswmsconnection.cpp
@@ -103,7 +103,7 @@ QgsWMSConnection::QgsWMSConnection( QString theConnName ) :
mUri.setParam( "InvertAxisOrientation", "1" );
}
- if( !connArgs.isEmpty() )
+ if ( !connArgs.isEmpty() )
{
connArgs.prepend( "ignoreUrl=" );
diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
index fd7269bc3218..99d89353d077 100644
--- a/src/providers/wms/qgswmsdataitems.cpp
+++ b/src/providers/wms/qgswmsdataitems.cpp
@@ -42,12 +42,12 @@ QVector QgsWMSConnectionItem::createChildren()
QString encodedUri = mPath;
QgsDataSourceURI uri;
- uri.setEncodedUri ( encodedUri );
-/*
- if ( mPath.contains ( "url=" ) )
+ uri.setEncodedUri( encodedUri );
+#if 0
+ if ( mPath.contains( "url=" ) )
{
encodedUri = mPath;
- uri.setEncodedUri ( encodedUri );
+ uri.setEncodedUri( encodedUri );
}
else
{
@@ -55,10 +55,10 @@ QVector QgsWMSConnectionItem::createChildren()
uri = connection.uri();
encodedUri = uri.encodedUri();
}
-*/
+#endif
QgsDebugMsg( "encodedUri = " + encodedUri );
- QgsWmsProvider *wmsProvider = new QgsWmsProvider ( encodedUri );
+ QgsWmsProvider *wmsProvider = new QgsWmsProvider( encodedUri );
if ( !wmsProvider ) return children;
// Attention: supportedLayers() gives tree leafes, not top level
@@ -100,7 +100,7 @@ bool QgsWMSConnectionItem::equal( const QgsDataItem *other )
{
return false;
}
-
+
return ( mPath == o->mPath && mName == o->mName );
}
@@ -240,7 +240,7 @@ QVectorQgsWMSRootItem::createChildren()
QgsWMSConnection connection( connName );
QgsDataItem * conn = new QgsWMSConnectionItem( this, connName, connection.uri().encodedUri() );
- conn->setIcon ( QIcon( getThemePixmap( "mIconConnect.png" ) ) );
+ conn->setIcon( QIcon( getThemePixmap( "mIconConnect.png" ) ) );
connections.append( conn );
}
return connections;
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
index 03987ee2a34b..eb65fadb9447 100644
--- a/src/providers/wms/qgswmsprovider.cpp
+++ b/src/providers/wms/qgswmsprovider.cpp
@@ -530,7 +530,7 @@ QImage *QgsWmsProvider::draw( QgsRectangle const &viewExtent, int pixelWidth, i
if ( mInvertAxisOrientation )
changeXY = !changeXY;
-
+
// compose the URL query string for the WMS server.
QString crsKey = "SRS"; //SRS in 1.1.1 and CRS in 1.3.0
if ( mCapabilities.version == "1.3.0" || mCapabilities.version == "1.3" )
@@ -1044,7 +1044,7 @@ void QgsWmsProvider::tileReplyFinished()
.arg( status.toString() )
.arg( contentType )
.arg( text.size() )
- .arg( reply->url().toString() ), tr( "WMS" ) );
+ .arg( reply->url().toString() ), tr( "WMS" ) );
#ifdef QGISDEBUG
QFile file( QDir::tempPath() + "/broken-image.png" );
if ( file.open( QIODevice::WriteOnly ) )
diff --git a/src/providers/wms/qgswmtsdimensions.cpp b/src/providers/wms/qgswmtsdimensions.cpp
index 80b0930d29f1..725cd72b2d14 100644
--- a/src/providers/wms/qgswmtsdimensions.cpp
+++ b/src/providers/wms/qgswmtsdimensions.cpp
@@ -31,7 +31,7 @@ QgsWmtsDimensions::QgsWmtsDimensions( const QgsWmtsTileLayer &layer, QWidget *pa
mDimensions->setRowCount( dims.size() );
- for( int i = 0; i < mDimensions->rowCount(); i++ )
+ for ( int i = 0; i < mDimensions->rowCount(); i++ )
{
const QgsWmtsDimension &d = layer.dimensions[ dims[i] ];
@@ -65,7 +65,7 @@ void QgsWmtsDimensions::selectedDimensions( QHash &selected )
{
selected.clear();
- for( int i = 0; irowCount(); i++ )
+ for ( int i = 0; i < mDimensions->rowCount(); i++ )
{
QComboBox *cb = qobject_cast< QComboBox * >( mDimensions->cellWidget( i, 4 ) );
Q_ASSERT( cb );
diff --git a/src/providers/wms/qgswmtsdimensions.h b/src/providers/wms/qgswmtsdimensions.h
index 3aaf5e35f901..66b8e597a0f0 100644
--- a/src/providers/wms/qgswmtsdimensions.h
+++ b/src/providers/wms/qgswmtsdimensions.h
@@ -41,7 +41,7 @@ class QgsWmtsDimensions : public QDialog, private Ui::QgsWmtsDimensionsBase
//! Destructor
~QgsWmtsDimensions();
- void selectedDimensions( QHash &dims );
+ void selectedDimensions( QHash &dims );
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
};
diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp
index 261c9dd9d622..d4e52c31a3c8 100644
--- a/src/python/qgspythonutilsimpl.cpp
+++ b/src/python/qgspythonutilsimpl.cpp
@@ -448,7 +448,7 @@ QString QgsPythonUtilsImpl::pluginsPath()
QString QgsPythonUtilsImpl::homePythonPath()
{
QString settingsDir = QgsApplication::qgisSettingsDirPath();
- if( settingsDir == QDir::homePath() + "/.qgis/" )
+ if ( settingsDir == QDir::homePath() + "/.qgis/" )
{
return "os.path.expanduser(\"~/.qgis/python\")";
}