Skip to content
Permalink
Browse files

Remove redundant initializations

Fixes when a member is initialized both in the header and
source to the same initial value

(via clang-tidy modernize-use-default-member-init fixit)
  • Loading branch information
nyalldawson committed Sep 10, 2017
1 parent 32dee44 commit ba64e3e53327a367deaff1867464e2716d3dd7f5
Showing with 207 additions and 825 deletions.
  1. +1 −2 src/analysis/interpolation/CloughTocherInterpolator.cpp
  2. +1 −2 src/analysis/interpolation/qgsgridfilewriter.cpp
  3. +0 −2 src/analysis/interpolation/qgstininterpolator.cpp
  4. +0 −9 src/analysis/openstreetmap/qgsosmdatabase.cpp
  5. +0 −2 src/analysis/openstreetmap/qgsosmdownload.cpp
  6. +0 −6 src/analysis/openstreetmap/qgsosmimport.cpp
  7. +0 −1 src/analysis/raster/qgsalignraster.cpp
  8. +0 −12 src/analysis/raster/qgsrastercalcnode.cpp
  9. +0 −2 src/analysis/raster/qgsrastermatrix.cpp
  10. +8 −0 src/app/CMakeLists.txt
  11. +1 −7 src/app/composer/qgsattributeselectiondialog.cpp
  12. +1 −4 src/app/composer/qgscomposerhtmlwidget.cpp
  13. +1 −1 src/app/composer/qgscomposerlegendwidget.cpp
  14. +1 −1 src/app/composer/qgscompositionwidget.cpp
  15. +0 −1 src/app/gps/qgsgpsinformationwidget.cpp
  16. +0 −2 src/app/nodetool/qgsselectedfeature.cpp
  17. +0 −1 src/app/nodetool/qgsvertexentry.cpp
  18. +0 −104 src/app/qgisapp.cpp
  19. +0 −1 src/app/qgisappinterface.cpp
  20. +1 −2 src/app/qgsattributetabledialog.cpp
  21. +1 −2 src/app/qgsbookmarks.cpp
  22. +1 −3 src/app/qgscustomization.cpp
  23. +3 −5 src/app/qgsfieldsproperties.cpp
  24. +1 −1 src/app/qgsformannotationdialog.cpp
  25. +1 −1 src/app/qgshtmlannotationdialog.cpp
  26. +0 −2 src/app/qgsidentifyresultsdialog.cpp
  27. +1 −1 src/app/qgslabelingwidget.cpp
  28. +0 −3 src/app/qgslayerstylingwidget.cpp
  29. +0 −3 src/app/qgsmaptooladdcircularstring.cpp
  30. +1 −1 src/app/qgsmaptoolcircularstringradius.cpp
  31. +0 −2 src/app/qgsmaptooldeletepart.cpp
  32. +0 −2 src/app/qgsmaptooldeletering.cpp
  33. +1 −3 src/app/qgsmaptoollabel.cpp
  34. +1 −2 src/app/qgsmaptoolmeasureangle.cpp
  35. +0 −1 src/app/qgsmaptoolmovefeature.cpp
  36. +0 −3 src/app/qgsmaptooloffsetcurve.cpp
  37. +0 −1 src/app/qgsmaptooloffsetpointsymbol.cpp
  38. +1 −1 src/app/qgsmaptoolpinlabels.cpp
  39. +0 −1 src/app/qgsmaptoolpointsymbol.cpp
  40. +0 −3 src/app/qgsmaptoolrotatefeature.cpp
  41. +0 −2 src/app/qgsmaptoolrotatelabel.cpp
  42. +0 −1 src/app/qgsmaptoolrotatepointsymbols.cpp
  43. +0 −1 src/app/qgsmaptoolsimplify.cpp
  44. +2 −4 src/app/qgsmergeattributesdialog.cpp
  45. +1 −1 src/app/qgsoptions.cpp
  46. +1 −2 src/app/qgspluginregistry.cpp
  47. +0 −2 src/app/qgsrasterlayerproperties.cpp
  48. +1 −3 src/app/qgsrulebasedlabelingwidget.cpp
  49. +1 −1 src/app/qgsselectbyformdialog.cpp
  50. +1 −1 src/app/qgssnappinglayertreemodel.cpp
  51. +1 −1 src/app/qgssnappingwidget.cpp
  52. +1 −1 src/app/qgsstatisticalsummarydockwidget.cpp
  53. +0 −2 src/app/qgsstatusbarcoordinateswidget.cpp
  54. +2 −3 src/app/qgssvgannotationdialog.cpp
  55. +1 −7 src/app/qgsvectorlayerproperties.cpp
  56. +0 −4 src/core/auth/qgsauthmanager.cpp
  57. +1 −3 src/core/composer/qgsaddremovemultiframecommand.cpp
  58. +2 −2 src/core/composer/qgscomposerarrow.cpp
  59. +0 −2 src/core/composer/qgscomposerattributetablev2.cpp
  60. +0 −1 src/core/composer/qgscomposerframe.cpp
  61. +0 −5 src/core/composer/qgscomposerhtml.cpp
  62. +0 −6 src/core/composer/qgscomposeritem.cpp
  63. +0 −1 src/core/composer/qgscomposeritemcommand.cpp
  64. +1 −1 src/core/composer/qgscomposerlabel.cpp
  65. +0 −2 src/core/composer/qgscomposerlegend.cpp
  66. +0 −2 src/core/composer/qgscomposermapoverview.cpp
  67. +1 −2 src/core/composer/qgscomposermousehandles.cpp
  68. +1 −1 src/core/composer/qgscomposermultiframecommand.cpp
  69. +0 −2 src/core/composer/qgscomposerpicture.cpp
  70. +0 −2 src/core/composer/qgscomposerscalebar.cpp
  71. +0 −2 src/core/composer/qgscomposershape.cpp
  72. +4 −4 src/core/composer/qgspaperitem.cpp
  73. +1 −1 src/core/dxf/qgsdxfpaintdevice.cpp
  74. +0 −2 src/core/effects/qgsgloweffect.cpp
  75. +1 −11 src/core/effects/qgspainteffect.cpp
  76. +2 −2 src/core/geometry/qgscurvepolygon.cpp
  77. +1 −1 src/core/geometry/qgsgeometry.cpp
  78. +0 −2 src/core/geometry/qgsgeos.cpp
  79. +1 −1 src/core/geometry/qgsgeos.h
  80. +0 −2 src/core/layertree/qgslayertreenode.cpp
  81. +0 −1 src/core/pal/labelposition.cpp
  82. +0 −5 src/core/pal/pointset.cpp
  83. +0 −7 src/core/pal/problem.cpp
  84. +7 −7 src/core/pal/problem.h
  85. +1 −1 src/core/providers/memory/qgsmemoryprovider.cpp
  86. +1 −2 src/core/qgsbrowsermodel.cpp
  87. +0 −2 src/core/qgsdataitem.cpp
  88. +1 −2 src/core/qgsdiagramrenderer.cpp
  89. +0 −1 src/core/qgsfieldmodel.cpp
  90. +0 −6 src/core/qgsgml.cpp
  91. +0 −1 src/core/qgsgmlschema.cpp
  92. +1 −6 src/core/qgslabelfeature.cpp
  93. +1 −2 src/core/qgslabelingengine.cpp
  94. +0 −1 src/core/qgsmaplayer.cpp
  95. +1 −1 src/core/qgsmaplayerstylemanager.cpp
  96. +1 −3 src/core/qgsmaprendererjob.cpp
  97. +1 −2 src/core/qgsmaprenderersequentialjob.cpp
  98. +1 −2 src/core/qgsmultirenderchecker.cpp
  99. +1 −2 src/core/qgsnetworkcontentfetcher.cpp
  100. +1 −8 src/core/qgspallabeling.cpp
  101. +1 −4 src/core/qgspointlocator.cpp
  102. +1 −3 src/core/qgsrelation.cpp
  103. +1 −1 src/core/qgsrulebasedlabeling.cpp
  104. +1 −2 src/core/qgsrunprocess.cpp
  105. +0 −1 src/core/qgssnappingutils.cpp
  106. +0 −1 src/core/qgsspatialindex.cpp
  107. +1 −1 src/core/qgstextlabelfeature.cpp
  108. +2 −2 src/core/qgstracer.cpp
  109. +1 −1 src/core/qgstrackedvectorlayertools.cpp
  110. +3 −13 src/core/qgsvectorfilewriter.cpp
  111. +3 −3 src/core/qgsvectorfilewriter.h
  112. +0 −9 src/core/qgsvectorlayer.cpp
  113. +1 −1 src/core/qgsvectorlayerfeatureiterator.cpp
  114. +0 −3 src/core/qgsvectorlayerrenderer.cpp
  115. +0 −2 src/core/raster/qgscontrastenhancement.cpp
  116. +0 −6 src/core/raster/qgsrasterblock.cpp
  117. +2 −4 src/core/raster/qgsrasterfilewriter.cpp
  118. +0 −1 src/core/raster/qgsrasteriterator.cpp
  119. +1 −2 src/core/raster/qgsrasterlayer.cpp
  120. +0 −2 src/core/raster/qgsrasterlayerrenderer.cpp
  121. +0 −2 src/core/raster/qgsrasterprojector.cpp
  122. +0 −1 src/core/raster/qgsrasterrenderer.cpp
  123. +1 −5 src/core/symbology/qgsfillsymbollayer.cpp
  124. +0 −4 src/core/symbology/qgsgeometrygeneratorsymbollayer.cpp
  125. +0 −1 src/core/symbology/qgsheatmaprenderer.cpp
  126. +2 −5 src/core/symbology/qgslegendsymbolitem.cpp
  127. +1 −2 src/core/symbology/qgsmarkersymbollayer.cpp
  128. +1 −1 src/core/symbology/qgspointdistancerenderer.cpp
  129. +0 −1 src/core/symbology/qgsrenderer.cpp
  130. +1 −1 src/core/symbology/qgsrulebasedrenderer.cpp
  131. +3 −10 src/core/symbology/qgssvgcache.cpp
  132. +1 −1 src/core/symbology/qgssymbollayer.cpp
  133. +0 −4 src/gui/attributetable/qgsattributetableview.cpp
  134. +1 −9 src/gui/attributetable/qgsdualview.cpp
  135. +0 −5 src/gui/attributetable/qgsfeaturelistview.cpp
  136. +0 −2 src/gui/attributetable/qgsfeaturelistviewdelegate.cpp
  137. +0 −1 src/gui/attributetable/qgsfieldconditionalformatwidget.cpp
  138. +0 −8 src/gui/auth/qgsauthauthoritieseditor.cpp
  139. +2 −11 src/gui/auth/qgsauthcertificateinfo.cpp
  140. +1 −2 src/gui/auth/qgsauthconfigedit.cpp
  141. +0 −10 src/gui/auth/qgsauthconfigeditor.cpp
  142. +2 −4 src/gui/auth/qgsauthconfigselect.cpp
  143. +2 −9 src/gui/auth/qgsautheditorwidgets.cpp
  144. +1 −3 src/gui/auth/qgsauthidentitieseditor.cpp
  145. +1 −2 src/gui/auth/qgsauthimportcertdialog.cpp
  146. +1 −2 src/gui/auth/qgsauthimportidentitydialog.cpp
  147. +1 −2 src/gui/auth/qgsauthmasterpassresetdialog.cpp
  148. +1 −3 src/gui/auth/qgsauthserverseditor.cpp
  149. +1 −10 src/gui/auth/qgsauthsslconfigwidget.cpp
  150. +0 −6 src/gui/auth/qgsauthsslimportdialog.cpp
  151. +1 −3 src/gui/auth/qgsauthtrustedcasdialog.cpp
  152. +1 −2 src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.cpp
  153. +1 −2 src/gui/editorwidgets/qgscheckboxwidgetwrapper.cpp
  154. +1 −1 src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp
  155. +1 −1 src/gui/editorwidgets/qgscolorwidgetwrapper.cpp
  156. +1 −2 src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
  157. +1 −2 src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp
  158. +0 −3 src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.cpp
  159. +1 −1 src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp
  160. +1 −3 src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp
  161. +1 −1 src/gui/editorwidgets/qgskeyvaluewidgetwrapper.cpp
  162. +1 −1 src/gui/editorwidgets/qgslistwidgetwrapper.cpp
  163. +1 −1 src/gui/editorwidgets/qgsmultiedittoolbutton.cpp
  164. +1 −6 src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
  165. +1 −1 src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp
  166. +0 −2 src/gui/editorwidgets/qgsrelationreferencesearchwidgetwrapper.cpp
  167. +0 −13 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  168. +0 −1 src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
  169. +1 −1 src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
  170. +1 −1 src/gui/editorwidgets/qgssearchwidgettoolbutton.cpp
  171. +1 −3 src/gui/editorwidgets/qgstexteditwrapper.cpp
  172. +1 −2 src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp
  173. +1 −2 src/gui/editorwidgets/qgsuuidwidgetwrapper.cpp
  174. +1 −1 src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.cpp
  175. +1 −1 src/gui/editorwidgets/qgsvaluemapwidgetwrapper.cpp
  176. +1 −4 src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
  177. +0 −4 src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
  178. +3 −5 src/gui/effects/qgseffectstackpropertieswidget.cpp
  179. +6 −6 src/gui/effects/qgspainteffectwidget.cpp
  180. +1 −1 src/gui/layertree/qgslayertreeembeddedconfigwidget.cpp
  181. +0 −1 src/gui/layertree/qgslayertreemapcanvasbridge.cpp
  182. +1 −2 src/gui/layertree/qgslayertreeview.cpp
  183. +1 −2 src/gui/ogr/qgsvectorlayersaveasdialog.cpp
  184. +1 −1 src/gui/qgsactionmenu.cpp
  185. +0 −1 src/gui/qgsattributedialog.cpp
  186. +0 −6 src/gui/qgsattributeform.cpp
  187. +0 −2 src/gui/qgsbrowserdockwidget.cpp
  188. +1 −3 src/gui/qgsbrowserdockwidget_p.cpp
  189. +1 −1 src/gui/qgsbusyindicatordialog.cpp
  190. +1 −1 src/gui/qgscolorbutton.cpp
  191. +0 −4 src/gui/qgscolorrampbutton.cpp
  192. +1 −8 src/gui/qgscolorwidgets.cpp
  193. +1 −1 src/gui/qgscomposeritemcombobox.cpp
  194. +0 −2 src/gui/qgscomposerruler.cpp
  195. +1 −1 src/gui/qgscomposerruler.h
  196. +0 −7 src/gui/qgscomposerview.cpp
  197. +1 −1 src/gui/qgscredentialdialog.cpp
  198. +0 −2 src/gui/qgsexpressionbuilderwidget.cpp
  199. +0 −5 src/gui/qgsexpressionlineedit.cpp
  200. +1 −2 src/gui/qgsexpressionselectiondialog.cpp
  201. +1 −1 src/gui/qgsfieldexpressionwidget.cpp
  202. +0 −2 src/gui/qgsfieldvalueslineedit.cpp
  203. +0 −4 src/gui/qgsfiledownloader.cpp
  204. +0 −3 src/gui/qgsfloatingwidget.cpp
  205. +1 −1 src/gui/qgsfontbutton.cpp
  206. +1 −1 src/gui/qgsgeometryrubberband.cpp
  207. +0 −1 src/gui/qgshighlight.cpp
  208. +1 −2 src/gui/qgslegendfilterbutton.cpp
  209. +3 −15 src/gui/qgsmapcanvas.cpp
  210. +1 −1 src/gui/qgsmapcanvassnappingutils.cpp
  211. +1 −2 src/gui/qgsmapcanvastracer.cpp
  212. +0 −2 src/gui/qgsmaplayeractionregistry.cpp
  213. +1 −1 src/gui/qgsmapoverviewcanvas.cpp
  214. +1 −1 src/gui/qgsmaptip.cpp
  215. +0 −3 src/gui/qgsmaptool.cpp
  216. +0 −4 src/gui/qgsmaptoolcapture.cpp
  217. +1 −1 src/gui/qgsmaptoolzoom.cpp
  218. +1 −1 src/gui/qgsmessagebar.cpp
  219. +2 −8 src/gui/qgsmessagebaritem.cpp
  220. +0 −1 src/gui/qgsnewgeopackagelayerdialog.cpp
  221. +1 −1 src/gui/qgsnewhttpconnection.cpp
  222. +0 −5 src/gui/qgsoptionsdialogbase.cpp
  223. +1 −1 src/gui/qgsowssourceselect.cpp
  224. +0 −2 src/gui/qgspasswordlineedit.cpp
  225. +0 −3 src/gui/qgsprojectionselectiontreewidget.cpp
  226. +1 −1 src/gui/qgspropertyoverridebutton.cpp
  227. +0 −3 src/gui/qgsrasterformatsaveoptionswidget.cpp
  228. +1 −1 src/gui/qgsratiolockbutton.cpp
  229. +1 −1 src/gui/qgsscalerangewidget.cpp
  230. +0 −1 src/gui/qgsscalewidget.cpp
  231. +0 −3 src/gui/qgssqlcomposerdialog.cpp
  232. +1 −1 src/gui/qgssubstitutionlistwidget.cpp
  233. +0 −1 src/gui/qgstaskmanagerwidget.cpp
  234. +0 −2 src/gui/qgstextformatwidget.cpp
  235. +2 −2 src/gui/qgsunitselectionwidget.cpp
  236. +0 −2 src/gui/qgsvariableeditorwidget.cpp
  237. +0 −1 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  238. +1 −1 src/gui/raster/qgsrasterhistogramwidget.cpp
  239. +0 −1 src/gui/raster/qgsrasterminmaxwidget.cpp
  240. +1 −1 src/gui/raster/qgsrendererrasterpropertieswidget.cpp
  241. +0 −1 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  242. +0 −1 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  243. +1 −1 src/gui/symbology/qgs25drendererwidget.cpp
  244. +1 −1 src/gui/symbology/qgsarrowsymbollayerwidget.cpp
  245. +1 −3 src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
  246. +1 −1 src/gui/symbology/qgsellipsesymbollayerwidget.cpp
  247. +0 −2 src/gui/symbology/qgsgraduatedhistogramwidget.cpp
  248. +1 −3 src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
  249. +1 −1 src/gui/symbology/qgsheatmaprendererwidget.cpp
  250. +1 −1 src/gui/symbology/qgsnullsymbolrendererwidget.cpp
  251. +1 −1 src/gui/symbology/qgspointclusterrendererwidget.cpp
  252. +1 −1 src/gui/symbology/qgspointdisplacementrendererwidget.cpp
  253. +1 −3 src/gui/symbology/qgsrendererpropertiesdialog.cpp
  254. +0 −2 src/gui/symbology/qgsrulebasedrendererwidget.cpp
  255. +1 −1 src/gui/symbology/qgsrulebasedrendererwidget.h
  256. +1 −1 src/gui/symbology/qgssinglesymbolrendererwidget.cpp
  257. +3 −3 src/gui/symbology/qgssymbollayerwidget.cpp
  258. +1 −5 src/gui/symbology/qgssymbolselectordialog.cpp
  259. +0 −3 src/gui/symbology/qgssymbolslistwidget.cpp
  260. +1 −1 src/gui/symbology/qgssymbolwidgetcontext.cpp
  261. +1 −1 src/gui/symbology/qgsvectorfieldsymbollayerwidget.cpp
  262. +0 −3 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  263. +0 −4 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  264. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.h
  265. +0 −2 src/providers/ogr/qgsogrfeatureiterator.cpp
  266. +1 −1 src/providers/ogr/qgsogrfeatureiterator.h
  267. +0 −1 src/providers/postgres/qgscolumntypethread.cpp
  268. +1 −1 src/providers/postgres/qgspgnewconnection.cpp
  269. +1 −2 src/providers/postgres/qgspgsourceselect.cpp
  270. +1 −1 src/providers/postgres/qgspostgresprovider.cpp
  271. +1 −1 src/providers/postgres/qgspostgrestransaction.cpp
  272. +0 −1 src/providers/spatialite/qgsspatialitefeatureiterator.cpp
  273. +0 −1 src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -20,8 +20,7 @@
#include "NormVecDecorator.h"

CloughTocherInterpolator::CloughTocherInterpolator()
: mTIN( nullptr )
, mEdgeTolerance( 0.00001 )
: mEdgeTolerance( 0.00001 )
, der1X( 0.0 )
, der1Y( 0.0 )
, der2X( 0.0 )
@@ -35,8 +35,7 @@ QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator *i, const QString &outputP
}

QgsGridFileWriter::QgsGridFileWriter()
: mInterpolator( nullptr )
, mNumColumns( 0 )
: mNumColumns( 0 )
, mNumRows( 0 )
, mCellSizeX( 0 )
, mCellSizeY( 0 )
@@ -31,8 +31,6 @@

QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData> &inputData, TINInterpolation interpolation, QgsFeedback *feedback )
: QgsInterpolator( inputData )
, mTriangulation( nullptr )
, mTriangleInterpolator( nullptr )
, mIsInitialized( false )
, mFeedback( feedback )
, mInterpolation( interpolation )
@@ -21,13 +21,6 @@

QgsOSMDatabase::QgsOSMDatabase( const QString &dbFileName )
: mDbFileName( dbFileName )
, mDatabase( nullptr )
, mStmtNode( nullptr )
, mStmtNodeTags( nullptr )
, mStmtWay( nullptr )
, mStmtWayNode( nullptr )
, mStmtWayNodePoints( nullptr )
, mStmtWayTags( nullptr )
{
}

@@ -547,7 +540,6 @@ QString QgsOSMDatabase::quotedValue( QString value )


QgsOSMNodeIterator::QgsOSMNodeIterator( sqlite3 *handle )
: mStmt( nullptr )
{
const char *sql = "SELECT id,lon,lat FROM nodes";
if ( sqlite3_prepare_v2( handle, sql, -1, &mStmt, nullptr ) != SQLITE_OK )
@@ -593,7 +585,6 @@ void QgsOSMNodeIterator::close()


QgsOSMWayIterator::QgsOSMWayIterator( sqlite3 *handle )
: mStmt( nullptr )
{
const char *sql = "SELECT id FROM ways";
if ( sqlite3_prepare_v2( handle, sql, -1, &mStmt, nullptr ) != SQLITE_OK )
@@ -39,14 +39,12 @@ QString QgsOSMDownload::queryFromRect( const QgsRectangle &rect )

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

QgsOSMDownload::QgsOSMDownload( const QString &query )
: mServiceUrl( defaultServiceUrl() )
, mQuery( query )
, mReply( nullptr )
{
}

@@ -23,12 +23,6 @@
QgsOSMXmlImport::QgsOSMXmlImport( const QString &xmlFilename, const QString &dbFilename )
: mXmlFileName( xmlFilename )
, mDbFileName( dbFilename )
, mDatabase( nullptr )
, mStmtInsertNode( nullptr )
, mStmtInsertNodeTag( nullptr )
, mStmtInsertWay( nullptr )
, mStmtInsertWayNode( nullptr )
, mStmtInsertWayTag( nullptr )
{

}
@@ -116,7 +116,6 @@ static CPLErr rescalePostWarpChunkProcessor( void *pKern, void *pArg )


QgsAlignRaster::QgsAlignRaster()
: mProgressHandler( nullptr )
{
// parameters
mCellSizeX = mCellSizeY = 0;
@@ -19,28 +19,20 @@

QgsRasterCalcNode::QgsRasterCalcNode()
: mType( tNumber )
, mLeft( nullptr )
, mRight( nullptr )
, mNumber( 0 )
, mMatrix( nullptr )
, mOperator( opNONE )
{
}

QgsRasterCalcNode::QgsRasterCalcNode( double number )
: mType( tNumber )
, mLeft( nullptr )
, mRight( nullptr )
, mNumber( number )
, mMatrix( nullptr )
, mOperator( opNONE )
{
}

QgsRasterCalcNode::QgsRasterCalcNode( QgsRasterMatrix *matrix )
: mType( tMatrix )
, mLeft( nullptr )
, mRight( nullptr )
, mNumber( 0 )
, mMatrix( matrix )
, mOperator( opNONE )
@@ -53,18 +45,14 @@ QgsRasterCalcNode::QgsRasterCalcNode( Operator op, QgsRasterCalcNode *left, QgsR
, mLeft( left )
, mRight( right )
, mNumber( 0 )
, mMatrix( nullptr )
, mOperator( op )
{
}

QgsRasterCalcNode::QgsRasterCalcNode( const QString &rasterName )
: mType( tRasterRef )
, mLeft( nullptr )
, mRight( nullptr )
, mNumber( 0 )
, mRasterName( rasterName )
, mMatrix( nullptr )
, mOperator( opNONE )
{
if ( mRasterName.startsWith( '"' ) && mRasterName.endsWith( '"' ) )
@@ -22,7 +22,6 @@
QgsRasterMatrix::QgsRasterMatrix()
: mColumns( 0 )
, mRows( 0 )
, mData( nullptr )
, mNodataValue( -1 )
{
}
@@ -38,7 +37,6 @@ QgsRasterMatrix::QgsRasterMatrix( int nCols, int nRows, double *data, double nod
QgsRasterMatrix::QgsRasterMatrix( const QgsRasterMatrix &m )
: mColumns( 0 )
, mRows( 0 )
, mData( nullptr )
{
operator=( m );
}
@@ -656,6 +656,14 @@ if(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
SET_TARGET_PROPERTIES(qgis_app PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
ENDIF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)

# clang-tidy
IF(CLANG_TIDY_EXE)
SET_TARGET_PROPERTIES(
qgis_app PROPERTIES
CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
)
ENDIF(CLANG_TIDY_EXE)

IF(NOT WIN32)
TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} qgis_app)
ENDIF(NOT WIN32)
@@ -272,13 +272,7 @@ QgsAttributeSelectionDialog::QgsAttributeSelectionDialog( QgsComposerAttributeTa
: QDialog( parent, f )
, mComposerTable( table )
, mVectorLayer( vLayer )
, mColumnModel( nullptr )
, mSortedProxyModel( nullptr )
, mAvailableSortProxyModel( nullptr )
, mColumnAlignmentDelegate( nullptr )
, mColumnSourceDelegate( nullptr )
, mColumnSortOrderDelegate( nullptr )
, mColumnWidthDelegate( nullptr )

{
setupUi( this );

@@ -72,10 +72,7 @@ QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml *html, QgsComposer

QgsComposerHtmlWidget::QgsComposerHtmlWidget()
: QgsComposerItemBaseWidget( nullptr, nullptr )
, mHtml( nullptr )
, mFrame( nullptr )
, mHtmlEditor( nullptr )
, mStylesheetEditor( nullptr )

{
}

@@ -119,7 +119,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend *legend )
connect( mItemFontButton, &QgsFontButton::changed, this, &QgsComposerLegendWidget::itemFontChanged );
}

QgsComposerLegendWidget::QgsComposerLegendWidget(): QgsComposerItemBaseWidget( nullptr, nullptr ), mLegend( nullptr )
QgsComposerLegendWidget::QgsComposerLegendWidget(): QgsComposerItemBaseWidget( nullptr, nullptr )
{
setupUi( this );
}
@@ -125,7 +125,7 @@ QgsCompositionWidget::QgsCompositionWidget( QWidget *parent, QgsComposition *c )

QgsCompositionWidget::QgsCompositionWidget()
: QgsPanelWidget( nullptr )
, mComposition( nullptr )

{
setupUi( this );
}
@@ -62,7 +62,6 @@

QgsGPSInformationWidget::QgsGPSInformationWidget( QgsMapCanvas *thepCanvas, QWidget *parent, Qt::WindowFlags f )
: QWidget( parent, f )
, mNmea( nullptr )
, mpCanvas( thepCanvas )
{
setupUi( this );
@@ -33,9 +33,7 @@ QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId,
QgsVectorLayer *vlayer,
QgsMapCanvas *canvas )
: mFeatureId( featureId )
, mGeometry( nullptr )
, mChangingGeometry( false )
, mValidator( nullptr )
{
setSelectedFeature( featureId, vlayer, canvas );
}
@@ -22,7 +22,6 @@ QgsVertexEntry::QgsVertexEntry( QgsMapCanvas *canvas, QgsMapLayer *layer, const
, mPenWidth( penWidth )
, mToolTip( tooltip )
, mType( type )
, mMarker( nullptr )
, mCanvas( canvas )
, mLayer( layer )
{
@@ -605,39 +605,9 @@ QgisApp *QgisApp::sInstance = nullptr;
// constructor starts here
QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCheck, const QString rootProfileLocation, const QString activeProfile, QWidget *parent, Qt::WindowFlags fl )
: QMainWindow( parent, fl )
, mNonEditMapTool( nullptr )
, mScaleWidget( nullptr )
, mMagnifierWidget( nullptr )
, mCoordsEdit( nullptr )
, mRotationLabel( nullptr )
, mRotationEdit( nullptr )
, mRotationEditValidator( nullptr )
, mProgressBar( nullptr )
, mRenderSuppressionCBox( nullptr )
, mOnTheFlyProjectionStatusLabel( nullptr )
, mOnTheFlyProjectionStatusButton( nullptr )
, mMessageButton( nullptr )
, mFeatureActionMenu( nullptr )
, mPopupMenu( nullptr )
, mDatabaseMenu( nullptr )
, mWebMenu( nullptr )
, mToolPopupOverviews( nullptr )
, mToolPopupDisplay( nullptr )
, mLayerTreeCanvasBridge( nullptr )
, mSplash( splash )
, mInternalClipboard( nullptr )
, mShowProjectionTab( false )
, mPythonUtils( nullptr )
, mSnappingWidget( nullptr )
, mMapStylingDock( nullptr )
, mComposerManager( nullptr )
, mpTileScaleWidget( nullptr )
, mpGpsWidget( nullptr )
, mTracer( nullptr )
, mSnappingUtils( nullptr )
, mProjectLastModified()
, mWelcomePage( nullptr )
, mCentralContainer( nullptr )
{
if ( sInstance )
{
@@ -1240,90 +1210,16 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh

QgisApp::QgisApp()
: QMainWindow( nullptr, 0 )
, mStyleSheetBuilder( nullptr )
, mActionPluginSeparator1( nullptr )
, mActionPluginSeparator2( nullptr )
, mActionRasterSeparator( nullptr )
, mMapToolGroup( nullptr )
, mPreviewGroup( nullptr )
#ifdef Q_OS_MAC
, mWindowMenu( nullptr )
#endif
, mPanelMenu( nullptr )
, mToolbarMenu( nullptr )
, mLayerTreeDock( nullptr )
, mLayerOrderDock( nullptr )
, mOverviewDock( nullptr )
, mpGpsDock( nullptr )
, mLogDock( nullptr )
, mNonEditMapTool( nullptr )
, mTaskManagerWidget( nullptr )
, mScaleWidget( nullptr )
, mMagnifierWidget( nullptr )
, mCoordsEdit( nullptr )
, mRotationLabel( nullptr )
, mRotationEdit( nullptr )
, mRotationEditValidator( nullptr )
, mProgressBar( nullptr )
, mRenderSuppressionCBox( nullptr )
, mOnTheFlyProjectionStatusLabel( nullptr )
, mOnTheFlyProjectionStatusButton( nullptr )
, mMessageButton( nullptr )
, mFeatureActionMenu( nullptr )
, mPopupMenu( nullptr )
, mDatabaseMenu( nullptr )
, mWebMenu( nullptr )
, mConfigMenu( nullptr )
, mToolPopupOverviews( nullptr )
, mToolPopupDisplay( nullptr )
, mMapCanvas( nullptr )
, mOverviewCanvas( nullptr )
, mLayerTreeView( nullptr )
, mLayerTreeCanvasBridge( nullptr )
, mMapLayerOrder( nullptr )
, mOverviewMapCursor( nullptr )
, mMapWindow( nullptr )
, mQgisInterface( nullptr )
, mSplash( nullptr )
, mInternalClipboard( nullptr )
, mShowProjectionTab( false )
, mpMapTipsTimer( nullptr )
, mpMaptip( nullptr )
, mMapTipsVisible( false )
, mFullScreenMode( false )
, mPrevScreenModeMaximized( false )
, mSaveRollbackInProgress( false )
, mPythonUtils( nullptr )
, mUndoWidget( nullptr )
, mUndoDock( nullptr )
, mBrowserWidget( nullptr )
, mBrowserWidget2( nullptr )
, mAdvancedDigitizingDockWidget( nullptr )
, mStatisticalSummaryDockWidget( nullptr )
, mBookMarksDockWidget( nullptr )
, mSnappingWidget( nullptr )
, mSnappingDialogContainer( nullptr )
, mSnappingDialog( nullptr )
, mPluginManager( nullptr )
, mMapStylingDock( nullptr )
, mMapStyleWidget( nullptr )
, mComposerManager( nullptr )
, mpTileScaleWidget( nullptr )
, mpGpsWidget( nullptr )
, mLastMapToolMessage( nullptr )
, mLogViewer( nullptr )
, mTrustedMacros( false )
, mMacrosWarn( nullptr )
, mUserInputDockWidget( nullptr )
, mVectorLayerTools( nullptr )
, mTracer( nullptr )
, mActionFilterLegend( nullptr )
, mActionStyleDock( nullptr )
, mLegendExpressionFilterButton( nullptr )
, mSnappingUtils( nullptr )
, mProjectLastModified()
, mWelcomePage( nullptr )
, mCentralContainer( nullptr )
, mProjOpen( 0 )
{
sInstance = this;
@@ -51,7 +51,6 @@

QgisAppInterface::QgisAppInterface( QgisApp *_qgis )
: qgis( _qgis )
, mTimer( nullptr )
, pluginManagerIface( _qgis->pluginManager() )
{
// connect signals
@@ -82,9 +82,8 @@ void QgsAttributeTableDialog::updateMultiEditButtonState()

QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *layer, QWidget *parent, Qt::WindowFlags flags )
: QDialog( parent, flags )
, mDock( nullptr )
, mLayer( layer )
, mCurrentSearchWidgetWrapper( nullptr )

{
setObjectName( QStringLiteral( "QgsAttributeTableDialog/" ) + layer->id() );
setupUi( this );

0 comments on commit ba64e3e

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