Skip to content
Permalink
Browse files

Standardise format of initializer lists

  • Loading branch information
nyalldawson committed May 2, 2016
1 parent cad3a5a commit ccebd83aa440bd09f9c7a3c022eafeac625a9216
Showing with 1,002 additions and 459 deletions.
  1. +3 −1 src/analysis/interpolation/Node.h
  2. +8 −2 src/analysis/interpolation/ParametricLine.h
  3. +8 −2 src/analysis/interpolation/Point3D.h
  4. +8 −2 src/analysis/interpolation/Vector3D.h
  5. +2 −2 src/analysis/network/qgsgraphbuilder.cpp
  6. +4 −2 src/analysis/network/qgsgraphbuilderintr.h
  7. +8 −2 src/analysis/openstreetmap/qgsosmbase.h
  8. +2 −1 src/analysis/openstreetmap/qgsosmdownload.cpp
  9. +2 −2 src/analysis/raster/qgsaspectfilter.cpp
  10. +15 −4 src/analysis/vector/qgstransectsample.cpp
  11. +4 −1 src/app/composer/qgscomposer.h
  12. +2 −1 src/app/openstreetmap/qgsosmdownloaddialog.cpp
  13. +3 −2 src/app/openstreetmap/qgsosmexportdialog.cpp
  14. +2 −1 src/app/openstreetmap/qgsosmimportdialog.cpp
  15. +5 −1 src/app/qgsapplayertreeviewmenuprovider.h
  16. +10 −10 src/app/qgsbrowserdockwidget.cpp
  17. +2 −1 src/app/qgsconfigureshortcutsdialog.cpp
  18. +2 −1 src/app/qgsdecorationcopyrightdialog.cpp
  19. +4 −1 src/app/qgsdecorationgriddialog.cpp
  20. +2 −1 src/app/qgsdecorationnortharrowdialog.cpp
  21. +2 −1 src/app/qgsdecorationscalebardialog.cpp
  22. +3 −1 src/app/qgsformannotationdialog.cpp
  23. +3 −1 src/app/qgshtmlannotationdialog.cpp
  24. +5 −2 src/app/qgsidentifyresultsdialog.h
  25. +5 −2 src/app/qgsmapstylingwidget.cpp
  26. +4 −4 src/app/qgsmaptoolcircularstringradius.cpp
  27. +8 −8 src/app/qgsmaptoolrotatepointsymbols.cpp
  28. +2 −1 src/app/qgsmaptoolselectradius.cpp
  29. +2 −1 src/app/qgsmeasuredialog.cpp
  30. +3 −3 src/app/qgsoptions.cpp
  31. +4 −4 src/app/qgspluginmetadata.cpp
  32. +2 −1 src/app/qgspluginregistry.cpp
  33. +2 −2 src/app/qgsrelationadddlg.cpp
  34. +4 −4 src/app/qgsrelationmanagerdialog.cpp
  35. +4 −1 src/core/composer/qgsatlascomposition.cpp
  36. +2 −1 src/core/composer/qgscomposerattributetable.cpp
  37. +2 −1 src/core/composer/qgscomposerattributetablev2.cpp
  38. +6 −1 src/core/composer/qgscomposermapgrid.h
  39. +5 −5 src/core/composer/qgscomposermultiframe.cpp
  40. +4 −4 src/core/composer/qgscomposernodesitem.cpp
  41. +14 −13 src/core/composer/qgscomposershape.cpp
  42. +8 −8 src/core/composer/qgscomposertablecolumn.cpp
  43. +5 −1 src/core/geometry/qgsabstractgeometryv2.h
  44. +3 −1 src/core/geometry/qgscurvepolygonv2.cpp
  45. +4 −1 src/core/geometry/qgsgeos.cpp
  46. +10 −3 src/core/geometry/qgswkbtypes.h
  47. +4 −1 src/core/pal/priorityqueue.cpp
  48. +4 −1 src/core/pal/rtree.hpp
  49. +14 −4 src/core/qgseditformconfig.h
  50. +4 −1 src/core/qgserror.h
  51. +37 −9 src/core/qgsexpression.h
  52. +5 −1 src/core/qgsexpressioncontext.h
  53. +5 −1 src/core/qgsexpressionfieldbuffer.h
  54. +3 −1 src/core/qgsfeatureiterator.h
  55. +6 −4 src/core/qgslayerdefinition.cpp
  56. +4 −1 src/core/qgslegendrenderer.h
  57. +3 −1 src/core/qgslogger.h
  58. +6 −2 src/core/qgsmaphittest.cpp
  59. +2 −2 src/core/qgsmaplayerlegend.cpp
  60. +26 −2 src/core/qgsmaprenderer.h
  61. +4 −1 src/core/qgsmaprendererjob.h
  62. +3 −3 src/core/qgsowsconnection.cpp
  63. +2 −1 src/core/qgspluginlayer.cpp
  64. +9 −4 src/core/qgspoint.h
  65. +23 −5 src/core/qgspointlocator.cpp
  66. +15 −3 src/core/qgspointlocator.h
  67. +5 −1 src/core/qgsprojectversion.h
  68. +4 −1 src/core/qgsrectangle.cpp
  69. +6 −3 src/core/qgsrulebasedlabeling.cpp
  70. +2 −1 src/core/qgsrunprocess.cpp
  71. +2 −1 src/core/qgsscalecalculator.cpp
  72. +6 −1 src/core/qgssnappingutils.h
  73. +2 −1 src/core/qgstransaction.cpp
  74. +9 −2 src/core/qgsvectordataprovider.h
  75. +9 −2 src/core/qgsvectorlayer.h
  76. +4 −4 src/core/qgsvirtuallayerdefinition.cpp
  77. +9 −2 src/core/qgsvirtuallayerdefinition.h
  78. +5 −1 src/core/raster/qgscolorrampshader.h
  79. +13 −6 src/core/raster/qgsrasterfilewriter.cpp
  80. +5 −2 src/core/symbology-ng/qgscptcityarchive.cpp
  81. +33 −24 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  82. +11 −11 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  83. +6 −2 src/core/symbology-ng/qgsinvertedpolygonrenderer.h
  84. +5 −1 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  85. +4 −1 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  86. +4 −1 src/core/symbology-ng/qgsrendererv2.h
  87. +4 −1 src/core/symbology-ng/qgsrendererv2registry.h
  88. +2 −1 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  89. +8 −2 src/core/symbology-ng/qgsrulebasedrendererv2.h
  90. +4 −1 src/core/symbology-ng/qgssymbollayerv2registry.h
  91. +11 −11 src/core/symbology-ng/qgssymbolv2.cpp
  92. +2 −1 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  93. +4 −1 src/core/symbology-ng/qgsvectorcolorrampv2.h
  94. +10 −4 src/gui/attributetable/qgsdualview.h
  95. +2 −2 src/gui/editorwidgets/qgscheckboxconfigdlg.cpp
  96. +2 −2 src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp
  97. +2 −2 src/gui/editorwidgets/qgsdatetimeeditfactory.cpp
  98. +2 −2 src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp
  99. +2 −2 src/gui/editorwidgets/qgsuniquevaluesconfigdlg.cpp
  100. +2 −2 src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
  101. +2 −1 src/gui/layertree/qgscustomlayerorderwidget.cpp
  102. +3 −1 src/gui/qgsbusyindicatordialog.cpp
  103. +2 −1 src/gui/qgscharacterselectdialog.cpp
  104. +4 −2 src/gui/qgscollapsiblegroupbox.cpp
  105. +4 −1 src/gui/qgscollapsiblegroupbox.h
  106. +6 −5 src/gui/qgscomposerruler.cpp
  107. +4 −4 src/gui/qgsdetaileditemdelegate.cpp
  108. +2 −2 src/gui/qgsdetaileditemwidget.cpp
  109. +2 −1 src/gui/qgsexpressionbuilderdialog.cpp
  110. +2 −2 src/gui/qgsfieldcombobox.cpp
  111. +2 −2 src/gui/qgsgroupwmsdatadialog.cpp
  112. +2 −2 src/gui/qgslegendfilterbutton.cpp
  113. +4 −1 src/gui/qgsmapcanvas.cpp
  114. +4 −1 src/gui/qgsmapcanvas.h
  115. +2 −2 src/gui/qgsmaplayercombobox.cpp
  116. +2 −1 src/gui/qgsmessagebar.cpp
  117. +2 −2 src/gui/qgspixmaplabel.cpp
  118. +3 −3 src/gui/qgsprevieweffect.cpp
  119. +2 −2 src/gui/qgsprojectionselectionwidget.cpp
  120. +6 −2 src/gui/qgsrasterformatsaveoptionswidget.cpp
  121. +6 −4 src/gui/qgsrasterlayersaveasdialog.cpp
  122. +2 −1 src/gui/qgsrasterpyramidsoptionswidget.cpp
  123. +5 −2 src/gui/qgsscalecombobox.cpp
  124. +2 −2 src/gui/qgsscalevisibilitydialog.cpp
  125. +2 −1 src/gui/qgssearchquerybuilder.cpp
  126. +2 −1 src/gui/qgssublayersdialog.cpp
  127. +5 −2 src/gui/symbology-ng/qgscolorrampcombobox.cpp
  128. +2 −1 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  129. +2 −1 src/gui/symbology-ng/qgsrendererv2widget.cpp
  130. +6 −1 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  131. +2 −1 src/gui/symbology-ng/qgssmartgroupeditordialog.cpp
  132. +2 −2 src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp
  133. +3 −1 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  134. +6 −1 src/gui/symbology-ng/qgssymbollayerv2widget.h
  135. +3 −1 src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  136. +2 −1 src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
  137. +3 −1 src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
  138. +2 −1 src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp
  139. +3 −1 src/plugins/geometry_checker/checks/qgsgeometryanglecheck.h
  140. +3 −1 src/plugins/geometry_checker/checks/qgsgeometryareacheck.h
  141. +7 −7 src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp
  142. +8 −2 src/plugins/geometry_checker/checks/qgsgeometrycheck.h
  143. +3 −1 src/plugins/geometry_checker/checks/qgsgeometrycontainedcheck.h
  144. +3 −1 src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.h
  145. +3 −1 src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h
  146. +6 −2 src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.h
  147. +3 −1 src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.h
  148. +3 −1 src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.h
  149. +3 −1 src/plugins/geometry_checker/checks/qgsgeometrytypecheck.h
  150. +3 −1 src/plugins/geometry_checker/qgsgeometrychecker.cpp
  151. +3 −1 src/plugins/geometry_checker/ui/qgsgeometrycheckerfixsummarydialog.cpp
  152. +5 −1 src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp
  153. +2 −1 src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
  154. +4 −1 src/plugins/geometry_checker/ui/qgsgeometrycheckfixdialog.cpp
  155. +3 −1 src/plugins/geometry_checker/utils/qgsfeaturepool.cpp
  156. +3 −1 src/plugins/geometry_checker/utils/qgsfeaturepool.h
  157. +4 −1 src/plugins/geometry_snapper/qgsgeometrysnapper.cpp
  158. +16 −5 src/plugins/geometry_snapper/qgssnapindex.cpp
  159. +2 −1 src/plugins/geometry_snapper/qgssnapindex.h
  160. +2 −1 src/plugins/georeferencer/qgsgcpcanvasitem.cpp
  161. +2 −2 src/plugins/georeferencer/qgsgeorefconfigdialog.cpp
  162. +3 −1 src/plugins/georeferencer/qgsgeoreftransform.cpp
  163. +7 −4 src/plugins/gps_importer/qgsbabelformat.cpp
  164. +2 −2 src/plugins/grass/qgsgrassmapcalc.cpp
  165. +2 −1 src/plugins/grass/qgsgrassmoduleparam.cpp
  166. +3 −3 src/plugins/grass/qgsgrassnewmapset.cpp
  167. +2 −1 src/plugins/grass/qgsgrasstools.cpp
  168. +3 −1 src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp
  169. +3 −1 src/plugins/roadgraph/shortestpathwidget.cpp
  170. +9 −6 src/plugins/roadgraph/units.cpp
  171. +8 −4 src/plugins/topology/topolError.h
  172. +2 −1 src/providers/db2/qgsdb2newconnection.cpp
  173. +23 −23 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  174. +7 −7 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
  175. +7 −1 src/providers/gpx/gpsdata.h
  176. +2 −2 src/providers/grass/qgsgrass.cpp
  177. +2 −2 src/providers/grass/qgsgrassprovidermodule.cpp
  178. +2 −1 src/providers/mssql/qgsmssqlnewconnection.cpp
  179. +4 −1 src/providers/ogr/qgsogrconnpool.h
  180. +2 −1 src/providers/postgres/qgspgnewconnection.cpp
  181. +2 −1 src/providers/postgres/qgspostgrestransaction.cpp
  182. +8 −2 src/providers/spatialite/qgsspatialiteconnection.h
  183. +2 −2 src/providers/virtual/qgsvirtuallayerfeatureiterator.cpp
  184. +11 −3 src/providers/virtual/qgsvirtuallayerprovider.h
  185. +11 −3 src/providers/virtual/qgsvirtuallayerqueryparser.h
  186. +3 −1 src/providers/virtual/qgsvirtuallayersqlitehelper.cpp
  187. +4 −1 src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
  188. +8 −1 src/providers/wcs/qgswcscapabilities.h
  189. +2 −2 src/providers/wfs/qgswfsdescribefeaturetype.cpp
  190. +9 −2 src/providers/wms/qgswmscapabilities.h
  191. +2 −2 src/providers/wms/qgswmsconnection.cpp
  192. +10 −2 src/providers/wms/qgswmsprovider.h
  193. +2 −2 src/server/qgsserverinterfaceimpl.cpp
  194. +5 −1 tests/src/core/testqgslegendrenderer.cpp
  195. +4 −1 tests/src/core/testqgsmaplayer.cpp
  196. +4 −1 tests/src/core/testqgspainteffect.cpp
  197. +4 −1 tests/src/core/testqgspointlocator.cpp
  198. +3 −2 tests/src/core/testqgsrasterlayer.cpp
  199. +12 −2 tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -42,7 +42,9 @@ class ANALYSIS_EXPORT Node
void setPoint( Point3D* p );
};

inline Node::Node() : mPoint( nullptr ), mNext( nullptr )
inline Node::Node()
: mPoint( nullptr )
, mNext( nullptr )
{

}
@@ -58,12 +58,18 @@ class ANALYSIS_EXPORT ParametricLine

//-----------------------------------------constructors and destructor----------------------

inline ParametricLine::ParametricLine() : mDegree( 0 ), mParent( nullptr ), mControlPoly( nullptr )
inline ParametricLine::ParametricLine()
: mDegree( 0 )
, mParent( nullptr )
, mControlPoly( nullptr )
{

}

inline ParametricLine::ParametricLine( ParametricLine* par, QVector<Point3D*>* controlpoly ) : mDegree( 0 ), mParent( par ), mControlPoly( controlpoly )
inline ParametricLine::ParametricLine( ParametricLine* par, QVector<Point3D*>* controlpoly )
: mDegree( 0 )
, mParent( par )
, mControlPoly( controlpoly )
{

}
@@ -54,12 +54,18 @@ class ANALYSIS_EXPORT Point3D
void setZ( double z );
};

inline Point3D::Point3D() : mX( 0 ), mY( 0 ), mZ( 0 )
inline Point3D::Point3D()
: mX( 0 )
, mY( 0 )
, mZ( 0 )
{

}

inline Point3D::Point3D( double x, double y, double z ) : mX( x ), mY( y ), mZ( z )
inline Point3D::Point3D( double x, double y, double z )
: mX( x )
, mY( y )
, mZ( z )
{

}
@@ -65,12 +65,18 @@ class ANALYSIS_EXPORT Vector3D

//------------------------------------------constructors------------------------------------

inline Vector3D::Vector3D( double x, double y, double z ) : mX( x ), mY( y ), mZ( z )
inline Vector3D::Vector3D( double x, double y, double z )
: mX( x )
, mY( y )
, mZ( z )
{

}

inline Vector3D::Vector3D() : mX( 0 ), mY( 0 ), mZ( 0 )//using a list
inline Vector3D::Vector3D()
: mX( 0 )
, mY( 0 )
, mZ( 0 )//using a list
{

}
@@ -21,8 +21,8 @@
#include <qgsfeature.h>
#include <qgsgeometry.h>

QgsGraphBuilder::QgsGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool otfEnabled, double topologyTolerance, const QString& ellipsoidID ) :
QgsGraphBuilderInterface( crs, otfEnabled, topologyTolerance, ellipsoidID )
QgsGraphBuilder::QgsGraphBuilder( const QgsCoordinateReferenceSystem& crs, bool otfEnabled, double topologyTolerance, const QString& ellipsoidID )
: QgsGraphBuilderInterface( crs, otfEnabled, topologyTolerance, ellipsoidID )
{
mGraph = new QgsGraph();
}
@@ -41,8 +41,10 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
* @param topologyTolerance sqrt distance between source point as one graph vertex
* @param ellipsoidID ellipsoid for edge measurement
*/
QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = "WGS84" ) :
mCrs( crs ), mCtfEnabled( ctfEnabled ), mTopologyTolerance( topologyTolerance )
QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = "WGS84" )
: mCrs( crs )
, mCtfEnabled( ctfEnabled )
, mTopologyTolerance( topologyTolerance )
{
mDa.setSourceCrs( mCrs.srsid() );
mDa.setEllipsoid( ellipsoidID );
@@ -57,7 +57,10 @@ class ANALYSIS_EXPORT QgsOSMNode : public QgsOSMElement
{
public:
QgsOSMNode() : mPoint() {}
QgsOSMNode( QgsOSMId id, const QgsPoint& point ) : QgsOSMElement( QgsOSMElementID::Node, id ), mPoint( point ) {}
QgsOSMNode( QgsOSMId id, const QgsPoint& point )
: QgsOSMElement( QgsOSMElementID::Node, id )
, mPoint( point )
{}

QgsPoint point() const { return mPoint; }

@@ -77,7 +80,10 @@ class ANALYSIS_EXPORT QgsOSMWay : public QgsOSMElement
{
public:
QgsOSMWay() {}
QgsOSMWay( QgsOSMId id, const QList<QgsOSMId>& nodes ) : QgsOSMElement( QgsOSMElementID::Way, id ), mNodes( nodes ) {}
QgsOSMWay( QgsOSMId id, const QList<QgsOSMId>& nodes )
: QgsOSMElement( QgsOSMElementID::Way, id )
, mNodes( nodes )
{}

QList<QgsOSMId> nodes() const { return mNodes; }

@@ -22,7 +22,8 @@ QString QgsOSMDownload::queryFromRect( const QgsRectangle& rect )


QgsOSMDownload::QgsOSMDownload()
: mServiceUrl( defaultServiceUrl() ), mReply( nullptr )
: mServiceUrl( defaultServiceUrl() )
, mReply( nullptr )
{
}

@@ -17,8 +17,8 @@

#include "qgsaspectfilter.h"

QgsAspectFilter::QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ) :
QgsDerivativeFilter( inputFile, outputFile, outputFormat )
QgsAspectFilter::QgsAspectFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat )
: QgsDerivativeFilter( inputFile, outputFile, outputFormat )
{

}
@@ -15,10 +15,21 @@
QgsTransectSample::QgsTransectSample( QgsVectorLayer* strataLayer, const QString& strataIdAttribute, const QString& minDistanceAttribute, const QString& nPointsAttribute, DistanceUnits minDistUnits,
QgsVectorLayer* baselineLayer, bool shareBaseline, const QString& baselineStrataId, const QString& outputPointLayer,
const QString& outputLineLayer, const QString& usedBaselineLayer, double minTransectLength,
double baselineBufferDistance, double baselineSimplificationTolerance ): mStrataLayer( strataLayer ),
mStrataIdAttribute( strataIdAttribute ), mMinDistanceAttribute( minDistanceAttribute ), mNPointsAttribute( nPointsAttribute ), mBaselineLayer( baselineLayer ), mShareBaseline( shareBaseline ),
mBaselineStrataId( baselineStrataId ), mOutputPointLayer( outputPointLayer ), mOutputLineLayer( outputLineLayer ), mUsedBaselineLayer( usedBaselineLayer ),
mMinDistanceUnits( minDistUnits ), mMinTransectLength( minTransectLength ), mBaselineBufferDistance( baselineBufferDistance ), mBaselineSimplificationTolerance( baselineSimplificationTolerance )
double baselineBufferDistance, double baselineSimplificationTolerance )
: mStrataLayer( strataLayer )
, mStrataIdAttribute( strataIdAttribute )
, mMinDistanceAttribute( minDistanceAttribute )
, mNPointsAttribute( nPointsAttribute )
, mBaselineLayer( baselineLayer )
, mShareBaseline( shareBaseline )
, mBaselineStrataId( baselineStrataId )
, mOutputPointLayer( outputPointLayer )
, mOutputLineLayer( outputLineLayer )
, mUsedBaselineLayer( usedBaselineLayer )
, mMinDistanceUnits( minDistUnits )
, mMinTransectLength( minTransectLength )
, mBaselineBufferDistance( baselineBufferDistance )
, mBaselineSimplificationTolerance( baselineSimplificationTolerance )
{
}

@@ -616,7 +616,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase

struct PanelStatus
{
PanelStatus( bool visible = true, bool active = false ) : isVisible( visible ), isActive( active ) {}
PanelStatus( bool visible = true, bool active = false )
: isVisible( visible )
, isActive( active )
{}
bool isVisible;
bool isActive;
};
@@ -30,7 +30,8 @@
#include "qgsosmdownload.h"

QgsOSMDownloadDialog::QgsOSMDownloadDialog( QWidget* parent )
: QDialog( parent ), mDownload( new QgsOSMDownload )
: QDialog( parent )
, mDownload( new QgsOSMDownload )
{
setupUi( this );

@@ -27,8 +27,9 @@
#include <QSettings>
#include <QStandardItemModel>

QgsOSMExportDialog::QgsOSMExportDialog( QWidget *parent ) :
QDialog( parent ), mDatabase( new QgsOSMDatabase )
QgsOSMExportDialog::QgsOSMExportDialog( QWidget *parent )
: QDialog( parent )
, mDatabase( new QgsOSMDatabase )
{
setupUi( this );

@@ -23,7 +23,8 @@
#include "qgsosmimport.h"

QgsOSMImportDialog::QgsOSMImportDialog( QWidget* parent )
: QDialog( parent ), mImport( new QgsOSMXmlImport )
: QDialog( parent )
, mImport( new QgsOSMXmlImport )
{
setupUi( this );

@@ -25,7 +25,11 @@ class QAction;
struct LegendLayerAction
{
LegendLayerAction( QAction* a, const QString& m, const QString& i, bool all )
: action( a ), menu( m ), id( i ), allLayers( all ) {}
: action( a )
, menu( m )
, id( i )
, allLayers( all )
{}
QAction* action;
QString menu;
QString id;
@@ -62,8 +62,8 @@ void QgsBrowserPropertiesWrapLabel::adjustHeight( QSizeF size )
setMaximumHeight( height );
}

QgsBrowserPropertiesWidget::QgsBrowserPropertiesWidget( QWidget* parent ) :
QWidget( parent )
QgsBrowserPropertiesWidget::QgsBrowserPropertiesWidget( QWidget* parent )
: QWidget( parent )
{
}

@@ -102,8 +102,8 @@ QgsBrowserPropertiesWidget* QgsBrowserPropertiesWidget::createWidget( QgsDataIte
return propertiesWidget;
}

QgsBrowserLayerProperties::QgsBrowserLayerProperties( QWidget* parent ) :
QgsBrowserPropertiesWidget( parent )
QgsBrowserLayerProperties::QgsBrowserLayerProperties( QWidget* parent )
: QgsBrowserPropertiesWidget( parent )
{
setupUi( this );

@@ -215,8 +215,8 @@ void QgsBrowserLayerProperties::setCondensedMode( bool condensedMode )
}
}

QgsBrowserDirectoryProperties::QgsBrowserDirectoryProperties( QWidget* parent ) :
QgsBrowserPropertiesWidget( parent )
QgsBrowserDirectoryProperties::QgsBrowserDirectoryProperties( QWidget* parent )
: QgsBrowserPropertiesWidget( parent )
, mDirectoryWidget( nullptr )
{
setupUi( this );
@@ -236,8 +236,8 @@ void QgsBrowserDirectoryProperties::setItem( QgsDataItem* item )
mLayout->addWidget( mDirectoryWidget );
}

QgsBrowserPropertiesDialog::QgsBrowserPropertiesDialog( const QString& settingsSection, QWidget* parent ) :
QDialog( parent )
QgsBrowserPropertiesDialog::QgsBrowserPropertiesDialog( const QString& settingsSection, QWidget* parent )
: QDialog( parent )
, mPropertiesWidget( nullptr )
, mSettingsSection( settingsSection )
{
@@ -262,8 +262,8 @@ void QgsBrowserPropertiesDialog::setItem( QgsDataItem* item )
setWindowTitle( item->type() == QgsDataItem::Layer ? tr( "Layer Properties" ) : tr( "Directory Properties" ) );
}

QgsBrowserDockWidget::QgsBrowserDockWidget( const QString& name, QWidget * parent ) :
QDockWidget( parent )
QgsBrowserDockWidget::QgsBrowserDockWidget( const QString& name, QWidget * parent )
: QDockWidget( parent )
, mModel( nullptr )
, mProxyModel( nullptr )
, mPropertiesWidgetEnabled( false )
@@ -29,7 +29,8 @@
#include <QSettings>

QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget* parent )
: QDialog( parent ), mGettingShortcut( false )
: QDialog( parent )
, mGettingShortcut( false )
{
setupUi( this );

@@ -24,7 +24,8 @@
#include <QPushButton>

QgsDecorationCopyrightDialog::QgsDecorationCopyrightDialog( QgsDecorationCopyright& deco, QWidget* parent )
: QDialog( parent ), mDeco( deco )
: QDialog( parent )
, mDeco( deco )
{
setupUi( this );

@@ -30,7 +30,10 @@
#include <QSettings>

QgsDecorationGridDialog::QgsDecorationGridDialog( QgsDecorationGrid& deco, QWidget* parent )
: QDialog( parent ), mDeco( deco ), mLineSymbol( nullptr ), mMarkerSymbol( nullptr )
: QDialog( parent )
, mDeco( deco )
, mLineSymbol( nullptr )
, mMarkerSymbol( nullptr )
{
setupUi( this );

@@ -22,7 +22,8 @@
#include <QPushButton>

QgsDecorationNorthArrowDialog::QgsDecorationNorthArrowDialog( QgsDecorationNorthArrow& deco, QWidget* parent )
: QDialog( parent ), mDeco( deco )
: QDialog( parent )
, mDeco( deco )
{
setupUi( this );

@@ -21,7 +21,8 @@
#include <QPushButton>

QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar& deco, int units, QWidget* parent )
: QDialog( parent ), mDeco( deco )
: QDialog( parent )
, mDeco( deco )
{
setupUi( this );

@@ -20,7 +20,9 @@
#include <QGraphicsScene>

QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent, Qt::WindowFlags f )
: QDialog( parent, f ), mItem( item ), mEmbeddedWidget( nullptr )
: QDialog( parent, f )
, mItem( item )
, mEmbeddedWidget( nullptr )
{
setupUi( this );
mEmbeddedWidget = new QgsAnnotationWidget( mItem );
@@ -20,7 +20,9 @@
#include <QGraphicsScene>

QgsHtmlAnnotationDialog::QgsHtmlAnnotationDialog( QgsHtmlAnnotationItem* item, QWidget * parent, Qt::WindowFlags f )
: QDialog( parent, f ), mItem( item ), mEmbeddedWidget( nullptr )
: QDialog( parent, f )
, mItem( item )
, mEmbeddedWidget( nullptr )
{
setupUi( this );
setWindowTitle( tr( "HTML annotation" ) );
@@ -263,8 +263,11 @@ class QgsIdentifyResultsDialogMapLayerAction : public QAction
Q_OBJECT

public:
QgsIdentifyResultsDialogMapLayerAction( const QString &name, QObject *parent, QgsMapLayerAction* action, QgsMapLayer* layer, QgsFeature * f ) :
QAction( name, parent ), mAction( action ), mFeature( f ), mLayer( layer )
QgsIdentifyResultsDialogMapLayerAction( const QString &name, QObject *parent, QgsMapLayerAction* action, QgsMapLayer* layer, QgsFeature * f )
: QAction( name, parent )
, mAction( action )
, mFeature( f )
, mLayer( layer )
{}

public slots:
@@ -10,8 +10,11 @@
#include "qgsmapcanvas.h"
#include "qgsmaplayer.h"

QgsMapStylingWidget::QgsMapStylingWidget( QgsMapCanvas* canvas, QWidget *parent ) :
QWidget( parent ), mMapCanvas( canvas ), mBlockAutoApply( false ), mCurrentLayer( nullptr )
QgsMapStylingWidget::QgsMapStylingWidget( QgsMapCanvas* canvas, QWidget *parent )
: QWidget( parent )
, mMapCanvas( canvas )
, mBlockAutoApply( false )
, mCurrentLayer( nullptr )
{
QBoxLayout* layout = new QVBoxLayout();
layout->setContentsMargins( 0, 0, 0, 0 );
@@ -26,10 +26,10 @@
#include <cmath>

QgsMapToolCircularStringRadius::QgsMapToolCircularStringRadius( QgsMapToolCapture* parentTool, QgsMapCanvas* canvas, CaptureMode mode )
: QgsMapToolAddCircularString( parentTool, canvas, mode ),
mTemporaryEndPoint( QgsPointV2() ),
mRadius( 0.0 ),
mRadiusSpinBox( nullptr )
: QgsMapToolAddCircularString( parentTool, canvas, mode )
, mTemporaryEndPoint( QgsPointV2() )
, mRadius( 0.0 )
, mRadiusSpinBox( nullptr )
{

}

0 comments on commit ccebd83

Please sign in to comment.
You can’t perform that action at this time.