Skip to content
Permalink
Browse files

Merge pull request #5602 from nyalldawson/modernize2

Apply some more clang-tidy modernizations
  • Loading branch information
nyalldawson committed Nov 11, 2017
2 parents 8c6e029 + 5a6c222 commit bcb815bbf13f965c5b82523d5666bba9e46c1712
Showing with 356 additions and 588 deletions.
  1. +0 −1 python/core/effects/qgsimageoperation.sip
  2. +3 −0 python/core/effects/qgspainteffect.sip
  3. +6 −0 python/core/fieldformatter/qgsvaluerelationfieldformatter.sip
  4. +3 −0 python/core/geometry/qgsabstractgeometry.sip
  5. +3 −0 python/core/qgsdartmeasurement.sip
  6. +7 −0 python/core/qgsdiagramrenderer.sip
  7. +6 −0 python/core/qgseditformconfig.sip
  8. +3 −0 python/core/qgseditorwidgetsetup.sip
  9. +6 −0 python/core/qgserror.sip
  10. +3 −0 python/core/qgsexpressioncontext.sip
  11. +4 −0 python/core/qgspallabeling.sip
  12. +3 −0 python/core/qgsvectorfilewriter.sip
  13. +3 −0 python/core/qgsvectorlayereditbuffer.sip
  14. +3 −0 python/core/qgsvectorlayerutils.sip
  15. +1 −0 python/core/symbology/qgssymbol.sip
  16. +3 −0 python/gui/qgsattributeeditorcontext.sip
  17. +3 −0 python/gui/qgsidentifymenu.sip
  18. +0 −2 python/gui/qgslonglongvalidator.sip
  19. +3 −0 python/gui/qgsmaptoolidentify.sip
  20. +0 −2 python/gui/qgssublayersdialog.sip
  21. +1 −0 python/server/qgsbufferserverresponse.sip
  22. +3 −3 src/3d/chunks/qgschunkedentity_p.h
  23. +0 −7 src/3d/chunks/qgschunklist_p.cpp
  24. +3 −2 src/3d/chunks/qgschunklist_p.h
  25. +0 −1 src/3d/qgs3dmapscene.cpp
  26. +0 −17 src/3d/qgs3dmapsettings.cpp
  27. +21 −14 src/3d/qgs3dmapsettings.h
  28. +0 −5 src/3d/qgsaabb.cpp
  29. +7 −3 src/3d/qgsaabb.h
  30. +0 −1 src/3d/qgscameracontroller.cpp
  31. +1 −1 src/3d/qgscameracontroller.h
  32. +1 −2 src/3d/qgsphongmaterialsettings.h
  33. +0 −4 src/3d/qgstessellatedpolygongeometry.cpp
  34. +1 −1 src/3d/qgstessellatedpolygongeometry.h
  35. +0 −7 src/3d/qgstilingscheme.cpp
  36. +2 −2 src/3d/qgstilingscheme.h
  37. +0 −10 src/3d/symbols/qgsline3dsymbol.cpp
  38. +10 −7 src/3d/symbols/qgsline3dsymbol.h
  39. +0 −6 src/3d/symbols/qgspoint3dsymbol.cpp
  40. +4 −2 src/3d/symbols/qgspoint3dsymbol.h
  41. +0 −8 src/3d/symbols/qgspolygon3dsymbol.cpp
  42. +8 −5 src/3d/symbols/qgspolygon3dsymbol.h
  43. +0 −8 src/3d/terrain/qgsdemterraingenerator.cpp
  44. +4 −3 src/3d/terrain/qgsdemterraingenerator.h
  45. +0 −4 src/3d/terrain/qgsdemterraintilegeometry_p.cpp
  46. +0 −4 src/3d/terrain/qgsdemterraintileloader_p.cpp
  47. +0 −1 src/3d/terrain/qgsdemterraintileloader_p.h
  48. +0 −5 src/3d/terrain/qgsflatterraingenerator.cpp
  49. +1 −1 src/3d/terrain/qgsflatterraingenerator.h
  50. +0 −1 src/3d/terrain/qgsterrainentity_p.cpp
  51. +0 −6 src/3d/terrain/qgsterraintextureimage_p.cpp
  52. +1 −3 src/3d/terrain/qgsterraintextureimage_p.h
  53. +1 −1 src/3d/terrain/qgsterraintileloader_p.h
  54. +0 −6 src/analysis/interpolation/Bezier3D.h
  55. +1 −7 src/analysis/interpolation/HalfEdge.h
  56. +1 −12 src/analysis/interpolation/LinTriangleInterpolator.h
  57. +2 −12 src/analysis/interpolation/ParametricLine.h
  58. +2 −12 src/analysis/interpolation/TriDecorator.h
  59. +1 −7 src/analysis/interpolation/Triangulation.h
  60. +1 −6 src/analysis/interpolation/Vector3D.h
  61. +1 −1 src/analysis/network/qgsgraph.h
  62. +1 −2 src/analysis/network/qgsgraphbuilderinterface.h
  63. +1 −1 src/analysis/network/qgsnetworkstrategy.h
  64. +1 −1 src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp
  65. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp
  66. +13 −21 src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp
  67. +2 −2 src/analysis/vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.cpp
  68. +4 −2 src/analysis/vector/qgsgeometrysnapper.h
  69. +0 −4 src/app/3d/qgs3dmapcanvas.cpp
  70. +0 −1 src/app/3d/qgs3dmapcanvasdockwidget.cpp
  71. +0 −4 src/app/3d/qgs3dmapconfigwidget.cpp
  72. +0 −1 src/app/3d/qgs3dmapconfigwidget.h
  73. +0 −4 src/app/3d/qgsvectorlayer3drendererwidget.cpp
  74. +1 −2 src/app/3d/qgsvectorlayer3drendererwidget.h
  75. +1 −2 src/app/qgisapp.h
  76. +0 −4 src/app/qgsattributerelationedit.cpp
  77. +0 −1 src/app/qgsattributerelationedit.h
  78. +0 −3 src/app/qgsattributesforminitcode.cpp
  79. +0 −1 src/app/qgsattributesforminitcode.h
  80. +0 −17 src/app/qgsattributesformproperties.cpp
  81. +12 −22 src/app/qgsattributesformproperties.h
  82. +1 −1 src/app/qgsattributetabledialog.cpp
  83. +1 −1 src/app/qgsfieldcalculator.cpp
  84. +0 −1 src/app/qgsmaptooldeletepart.cpp
  85. +1 −1 src/app/qgsmaptoollabel.h
  86. +1 −7 src/app/qgssourcefieldsproperties.cpp
  87. +0 −1 src/app/qgssourcefieldsproperties.h
  88. +0 −10 src/app/qgsversionmigration.cpp
  89. +2 −2 src/app/qgsversionmigration.h
  90. +2 −2 src/app/qgswelcomepageitemsmodel.cpp
  91. +0 −2 src/core/effects/qgsimageoperation.h
  92. +0 −5 src/core/effects/qgspainteffect.cpp
  93. +2 −1 src/core/effects/qgspainteffect.h
  94. +2 −1 src/core/expression/qgsexpression.h
  95. +3 −2 src/core/fieldformatter/qgsvaluerelationfieldformatter.h
  96. +7 −6 src/core/geometry/qgsabstractgeometry.h
  97. +1 −0 src/core/geometry/qgsgeometrymakevalid.cpp
  98. +1 −1 src/core/layout/qgslayoutitemgroupundocommand.cpp
  99. +2 −1 src/core/layout/qgslayoutitemgroupundocommand.h
  100. +1 −3 src/core/layout/qgslayoutundostack.cpp
  101. +7 −17 src/core/pal/rtree.hpp
  102. +2 −2 src/core/pal/util.h
  103. +1 −2 src/core/qgsaction.h
  104. +3 −1 src/core/qgsattributes.h
  105. +1 −2 src/core/qgsattributetableconfig.h
  106. +1 −2 src/core/qgscolorscheme.cpp
  107. +2 −2 src/core/qgsdartmeasurement.h
  108. +0 −5 src/core/qgsdiagramrenderer.cpp
  109. +5 −3 src/core/qgsdiagramrenderer.h
  110. +4 −2 src/core/qgseditformconfig.h
  111. +2 −1 src/core/qgseditorwidgetsetup.h
  112. +4 −3 src/core/qgserror.h
  113. +1 −2 src/core/qgsexception.h
  114. +2 −1 src/core/qgsexpressioncontext.h
  115. +1 −2 src/core/qgsfeaturefiltermodel.h
  116. +0 −4 src/core/qgsfeaturefiltermodel_p.h
  117. +1 −1 src/core/qgsfeaturefilterprovider.h
  118. +1 −5 src/core/qgsfeatureiterator.h
  119. +1 −1 src/core/qgsfeaturerequest.h
  120. +1 −1 src/core/qgsfield_p.h
  121. +1 −1 src/core/qgsgml.h
  122. +2 −2 src/core/qgslegendrenderer.h
  123. +2 −4 src/core/qgsmultirenderchecker.cpp
  124. +1 −1 src/core/qgsogcutils.h
  125. +1 −3 src/core/qgsoptional.h
  126. +3 −2 src/core/qgspallabeling.h
  127. +1 −2 src/core/qgspointlocator.h
  128. +1 −2 src/core/qgspointxy.h
  129. +1 −1 src/core/qgsproject.cpp
  130. +1 −2 src/core/qgsprojectversion.h
  131. +1 −2 src/core/qgsproperty_p.h
  132. +2 −2 src/core/qgsrelation.h
  133. +2 −2 src/core/qgssqlstatement.h
  134. +0 −3 src/core/qgstextrenderer.h
  135. +2 −2 src/core/qgsvectorfilewriter.h
  136. +2 −1 src/core/qgsvectorlayereditbuffer.h
  137. +1 −1 src/core/qgsvectorlayerfeatureiterator.cpp
  138. +1 −4 src/core/qgsvectorlayerjoinbuffer.cpp
  139. +2 −1 src/core/qgsvectorlayerutils.h
  140. +1 −1 src/core/raster/qgscolorrampshader.h
  141. +6 −0 src/core/symbology/qgssymbol.h
  142. +3 −3 src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
  143. +0 −5 src/gui/layout/qgslayoutitemwidget.cpp
  144. +2 −2 src/gui/qgsattributeeditorcontext.h
  145. +2 −1 src/gui/qgsattributeform.cpp
  146. +0 −3 src/gui/qgsattributeform.h
  147. +2 −2 src/gui/qgsidentifymenu.h
  148. +0 −3 src/gui/qgslonglongvalidator.h
  149. +2 −1 src/gui/qgsmaptoolidentify.h
  150. +1 −1 src/gui/qgsmetadatawidget.cpp
  151. +1 −1 src/gui/qgsoptionswidgetfactory.h
  152. +1 −1 src/gui/qgssqlcomposerdialog.h
  153. +0 −2 src/gui/qgssublayersdialog.h
  154. +2 −2 src/gui/qgstabwidget.h
  155. +1 −1 src/plugins/geometry_checker/qgsgeometrycheckfactory.h
  156. +1 −1 src/plugins/georeferencer/qgsgeoreftransform.h
  157. +0 −4 src/plugins/georeferencer/qgsmapcoordsdialog.h
  158. +1 −1 src/plugins/gps_importer/qgsbabelformat.h
  159. +1 −1 src/plugins/gps_importer/qgsgpsdevice.h
  160. +0 −4 src/plugins/grass/qgsgrassmapcalc.cpp
  161. +1 −1 src/plugins/grass/qgsgrassmapcalc.h
  162. +3 −2 src/plugins/qgsapplydialog.h
  163. +1 −2 src/plugins/topology/topolError.h
  164. +1 −8 src/plugins/topology/topolTest.cpp
  165. +0 −1 src/providers/arcgisrest/qgsamsprovider.cpp
  166. +0 −1 src/providers/grass/qgsgrassvectormap.cpp
  167. +1 −2 src/providers/grass/qgsgrassvectormaplayer.cpp
  168. +2 −3 src/providers/ogr/qgscplerrorhandler.h
  169. +0 −12 src/providers/ogr/qgsogrprovider.cpp
  170. +4 −4 src/providers/ogr/qgsogrprovider.h
  171. +2 −1 src/providers/postgres/qgspostgresconn.h
  172. +1 −1 src/providers/postgres/qgspostgresfeatureiterator.h
  173. +4 −4 src/providers/spatialite/qgsspatialitefeatureiterator.h
  174. +1 −1 src/providers/virtual/qgsslottofunction.h
  175. +1 −1 src/providers/virtual/qgsvirtuallayerprovider.h
  176. +1 −2 src/providers/virtual/qgsvirtuallayerqueryparser.h
  177. +1 −1 src/providers/virtual/qgsvirtuallayersqlitehelper.h
  178. +1 −8 src/providers/wfs/qgswfsprovider.cpp
  179. +1 −1 src/python/qgspythonutils.h
  180. +6 −0 src/server/qgsbufferserverresponse.h
  181. +5 −2 src/server/qgsfilterrestorer.h
  182. +6 −18 src/server/qgsserverprojectutils.cpp
  183. +3 −3 src/server/services/wms/qgswmsrenderer.cpp
  184. +4 −4 tests/src/analysis/testqgsprocessing.cpp
  185. +3 −3 tests/src/core/testqgsauthmanager.cpp
  186. +1 −5 tests/src/core/testqgscadutils.cpp
  187. +1 −1 tests/src/core/testqgslayoutmodel.cpp
  188. +1 −1 tests/src/gui/testqgsrelationreferencewidget.cpp
  189. +1 −1 tests/src/providers/testqgswcspublicservers.h
@@ -93,7 +93,6 @@ class QgsImageOperation

struct DistanceTransformProperties
{
DistanceTransformProperties();

bool shadeExterior;
%Docstring
@@ -300,6 +300,9 @@ class QgsDrawSourceEffect : QgsPaintEffect
public:

QgsDrawSourceEffect();
%Docstring
Constructor for QgsDrawSourceEffect
%End

static QgsPaintEffect *create( const QgsStringMap &map ) /Factory/;
%Docstring
@@ -25,8 +25,14 @@ class QgsValueRelationFieldFormatter : QgsFieldFormatter
struct ValueRelationItem
{
ValueRelationItem( const QVariant &key, const QString &value );
%Docstring
Constructor for ValueRelationItem
%End

ValueRelationItem();
%Docstring
Constructor for ValueRelationItem
%End

QVariant key;
QString value;
@@ -646,6 +646,9 @@ class QgsVertexIterator
%End
public:
QgsVertexIterator();
%Docstring
Constructor for QgsVertexIterator
%End

QgsVertexIterator( const QgsAbstractGeometry *geometry );
%Docstring
@@ -24,6 +24,9 @@ class QgsDartMeasurement
};

QgsDartMeasurement();
%Docstring
Constructor for QgsDartMeasurement
%End

QgsDartMeasurement( const QString &name, Type type, const QString &value );

@@ -319,6 +319,9 @@ class QgsDiagramSettings
};

QgsDiagramSettings();
%Docstring
Constructor for QgsDiagramSettings
%End

bool enabled;
QFont font;
@@ -614,7 +617,11 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRenderer
#include "qgsdiagramrenderer.h"
%End
public:

QgsSingleCategoryDiagramRenderer();
%Docstring
Constructor for QgsSingleCategoryDiagramRenderer
%End

virtual QgsSingleCategoryDiagramRenderer *clone() const /Factory/;

@@ -29,6 +29,9 @@ class QgsEditFormConfig
struct GroupData
{
GroupData();
%Docstring
Constructor for GroupData
%End
GroupData( const QString &name, const QList<QString> &fields );
QString mName;
QList<QString> mFields;
@@ -37,6 +40,9 @@ class QgsEditFormConfig
struct TabData
{
TabData();
%Docstring
Constructor for TabData
%End
TabData( const QString &name, const QList<QString> &fields, const QList<QgsEditFormConfig::GroupData> &groups );
QString mName;
QList<QString> mFields;
@@ -27,6 +27,9 @@ class QgsEditorWidgetSetup
%End

QgsEditorWidgetSetup();
%Docstring
Constructor for QgsEditorWidgetSetup
%End

QString type() const;
%Docstring
@@ -27,6 +27,9 @@ class QgsErrorMessage
};

QgsErrorMessage();
%Docstring
Constructor for QgsErrorMessage
%End

QgsErrorMessage( const QString &message, const QString &tag = QString(), const QString &file = QString(), const QString &function = QString(), int line = 0 );
%Docstring
@@ -75,6 +78,9 @@ class QgsError
public:

QgsError();
%Docstring
Constructor for QgsError
%End

QgsError( const QString &message, const QString &tag );
%Docstring
@@ -345,6 +345,9 @@ class QgsExpressionContext
public:

QgsExpressionContext();
%Docstring
Constructor for QgsExpressionContext
%End

explicit QgsExpressionContext( const QList<QgsExpressionContextScope *> &scopes /Transfer/ );
%Docstring
@@ -20,7 +20,11 @@ class QgsLabelPosition
%End
public:
QgsLabelPosition( int id, double r, const QVector< QgsPointXY > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram = false, bool pinned = false, const QString &providerId = QString() );

QgsLabelPosition();
%Docstring
Constructor for QgsLabelPosition
%End

int featureId;
double rotation;
@@ -107,6 +107,9 @@ There are two possibilities how to use this class:
struct MetaData
{
MetaData();
%Docstring
Constructor for MetaData
%End

MetaData( const QString &longName, const QString &trLongName, const QString &glob, const QString &ext, const QMap<QString, QgsVectorFileWriter::Option *> &driverOptions, const QMap<QString, QgsVectorFileWriter::Option *> &layerOptions, const QString &compulsoryEncoding = QString() );

@@ -249,6 +249,9 @@ Signals emitted after committing changes
protected:

QgsVectorLayerEditBuffer();
%Docstring
Constructor for QgsVectorLayerEditBuffer
%End

void updateFields( QgsFields &fields );

@@ -36,6 +36,9 @@ class QgsVectorLayerUtils
public:

QgsDuplicateFeatureContext();
%Docstring
Constructor for QgsDuplicateFeatureContext
%End

QList<QgsVectorLayer *> layers() const;
%Docstring
@@ -404,6 +404,7 @@ class QgsSymbolRenderContext
\param mapUnitScale
%End


QgsRenderContext &renderContext();
%Docstring
:rtype: QgsRenderContext
@@ -39,6 +39,9 @@ class QgsAttributeEditorContext
};

QgsAttributeEditorContext();
%Docstring
Constructor for QgsAttributeEditorContext
%End

QgsAttributeEditorContext( const QgsAttributeEditorContext &parentContext, FormMode formMode );

@@ -32,6 +32,9 @@ class QgsIdentifyMenu : QMenu
struct ActionData
{
ActionData();
%Docstring
Constructor for ActionData
%End

ActionData( QgsMapLayer *layer, QgsMapLayerAction *mapLayerAction = 0 );

@@ -20,8 +20,6 @@ class QgsLongLongValidator : QValidator

QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent );

~QgsLongLongValidator();

virtual QValidator::State validate( QString &input, int & ) const;

void setBottom( qint64 bottom );
@@ -47,6 +47,9 @@ after selecting a point, performs the identification:
struct IdentifyResult
{
IdentifyResult();
%Docstring
Constructor for IdentifyResult
%End

IdentifyResult( QgsMapLayer *layer, const QgsFeature &feature, const QMap< QString, QString > &derivedAttributes );
IdentifyResult( QgsMapLayer *layer, const QString &label, const QMap< QString, QString > &attributes, const QMap< QString, QString > &derivedAttributes );
@@ -25,8 +25,6 @@ class QgsSublayersDialog : QDialog

struct LayerDefinition
{
LayerDefinition();

int layerId;
QString layerName; //!< Name of the layer (not necessarily unique)
int count;
@@ -22,6 +22,7 @@ class QgsBufferServerResponse: QgsServerResponse

QgsBufferServerResponse();


virtual void setHeader( const QString &key, const QString &value );

%Docstring
@@ -103,7 +103,7 @@ class QgsChunkedEntity : public Qt3DCore::QEntity
//! root node of the quadtree hierarchy
QgsChunkNode *mRootNode = nullptr;
//! A chunk has been loaded recently? let's display it!
bool mNeedsUpdate;
bool mNeedsUpdate = false;
//! max. allowed screen space error
float mTau;
//! maximum allowed depth of quad tree
@@ -117,14 +117,14 @@ class QgsChunkedEntity : public Qt3DCore::QEntity
//! list of nodes that are being currently used for rendering
QList<QgsChunkNode *> mActiveNodes;
//! number of nodes omitted during frustum culling - for the curious ones
int mFrustumCulled;
int mFrustumCulled = 0;

// TODO: max. length for loading queue

QTime mCurrentTime;

//! max. length for replacement queue
int mMaxLoadedChunks;
int mMaxLoadedChunks = 512;

//! Entity that shows bounding boxes of active chunks (null if not enabled)
QgsChunkBoundsEntity *mBboxesEntity = nullptr;
@@ -19,13 +19,6 @@

///@cond PRIVATE

QgsChunkList::QgsChunkList()
: mHead( nullptr )
, mTail( nullptr )
, mCount( 0 )
{
}

int QgsChunkList::trueCount() const
{
int len = 0;
@@ -64,7 +64,8 @@ struct QgsChunkListEntry
class QgsChunkList
{
public:
QgsChunkList();
//! Constructor for QgsChunkList
QgsChunkList() = default;

//! Counts the real number of entries by walking the list (for debugging purposes only)
int trueCount() const;
@@ -99,7 +100,7 @@ class QgsChunkList
private:
QgsChunkListEntry *mHead = nullptr;
QgsChunkListEntry *mTail = nullptr;
int mCount;
int mCount = 0;
};

/// @endcond
@@ -42,7 +42,6 @@
Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, Qt3DExtras::QForwardRenderer *defaultFrameGraph, Qt3DRender::QRenderSettings *renderSettings, Qt3DRender::QCamera *camera, const QRect &viewportRect, Qt3DCore::QNode *parent )
: Qt3DCore::QEntity( parent )
, mMap( map )
, mTerrain( nullptr )
, mForwardRenderer( defaultFrameGraph )
{

@@ -26,23 +26,6 @@
#include "qgssymbollayerutils.h"
#include "qgsrasterlayer.h"


Qgs3DMapSettings::Qgs3DMapSettings()
: mOriginX( 0 )
, mOriginY( 0 )
, mOriginZ( 0 )
, mBackgroundColor( Qt::black )
, mTerrainVerticalScale( 1 )
, mMapTileResolution( 512 )
, mMaxTerrainScreenError( 3.f )
, mMaxTerrainGroundError( 1.f )
, mShowTerrainBoundingBoxes( false )
, mShowTerrainTileInfo( false )
, mShowLabels( false )
, mSkyboxEnabled( false )
{
}

Qgs3DMapSettings::Qgs3DMapSettings( const Qgs3DMapSettings &other )
: QObject()
, mOriginX( other.mOriginX )
@@ -47,7 +47,9 @@ class _3D_EXPORT Qgs3DMapSettings : public QObject
{
Q_OBJECT
public:
Qgs3DMapSettings();

//! Constructor for Qgs3DMapSettings
Qgs3DMapSettings() = default;
//! Copy constructor
Qgs3DMapSettings( const Qgs3DMapSettings &other );
~Qgs3DMapSettings();
@@ -206,23 +208,28 @@ class _3D_EXPORT Qgs3DMapSettings : public QObject
void showLabelsChanged();

private:
double mOriginX, mOriginY, mOriginZ; //!< Coordinates in map CRS at which our 3D world has origin (0,0,0)
//! X coordinate in map CRS at which our 3D world has origin (0,0,0)
double mOriginX = 0;
//! Y coordinate in map CRS at which our 3D world has origin (0,0,0)
double mOriginY = 0;
//! Z coordinate in map CRS at which our 3D world has origin (0,0,0)
double mOriginZ = 0;
QgsCoordinateReferenceSystem mCrs; //!< Destination coordinate system of the world
QColor mBackgroundColor; //!< Background color of the scene
QColor mSelectionColor; //!< Color to be used for selected map features
double mTerrainVerticalScale; //!< Multiplier of terrain heights to make the terrain shape more pronounced
QColor mBackgroundColor = Qt::black; //!< Background color of the scene
QColor mSelectionColor; //!< Color to be used for selected map features
double mTerrainVerticalScale = 1; //!< Multiplier of terrain heights to make the terrain shape more pronounced
std::unique_ptr<QgsTerrainGenerator> mTerrainGenerator; //!< Implementation of the terrain generation
int mMapTileResolution; //!< Size of map textures of tiles in pixels (width/height)
float mMaxTerrainScreenError; //!< Maximum allowed terrain error in pixels (determines when tiles are switched to more detailed ones)
float mMaxTerrainGroundError; //!< Maximum allowed horizontal map error in map units (determines how many zoom levels will be used)
bool mShowTerrainBoundingBoxes; //!< Whether to show bounding boxes of entities - useful for debugging
bool mShowTerrainTileInfo; //!< Whether to draw extra information about terrain tiles to the textures - useful for debugging
bool mShowLabels; //!< Whether to display labels on terrain tiles
int mMapTileResolution = 512; //!< Size of map textures of tiles in pixels (width/height)
float mMaxTerrainScreenError = 3.f; //!< Maximum allowed terrain error in pixels (determines when tiles are switched to more detailed ones)
float mMaxTerrainGroundError = 1.f; //!< Maximum allowed horizontal map error in map units (determines how many zoom levels will be used)
bool mShowTerrainBoundingBoxes = false; //!< Whether to show bounding boxes of entities - useful for debugging
bool mShowTerrainTileInfo = false; //!< Whether to draw extra information about terrain tiles to the textures - useful for debugging
bool mShowLabels = false; //!< Whether to display labels on terrain tiles
QList<QgsMapLayerRef> mLayers; //!< Layers to be rendered
QList<QgsAbstract3DRenderer *> mRenderers; //!< Extra stuff to render as 3D object
bool mSkyboxEnabled; //!< Whether to render skybox
QString mSkyboxFileBase; //!< Base part of the files with skybox textures
QString mSkyboxFileExtension; //!< Extension part of the files with skybox textures
bool mSkyboxEnabled = false; //!< Whether to render skybox
QString mSkyboxFileBase; //!< Base part of the files with skybox textures
QString mSkyboxFileExtension; //!< Extension part of the files with skybox textures
};


@@ -15,11 +15,6 @@

#include "qgsaabb.h"

QgsAABB::QgsAABB()
: xMin( 0 ), yMin( 0 ), zMin( 0 ), xMax( 0 ), yMax( 0 ), zMax( 0 )
{
}

QgsAABB::QgsAABB( float xMin, float yMin, float zMin, float xMax, float yMax, float zMax )
: xMin( xMin ), yMin( yMin ), zMin( zMin ), xMax( xMax ), yMax( yMax ), zMax( zMax )
{

0 comments on commit bcb815b

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