Fix some doxygen warnings

wonder-sk · wonder-sk · commit 7c01d2fa70f6 · 2017-09-25T22:38:49.000+02:00
diff --git a/src/3d/chunks/chunkboundsentity.cpp b/src/3d/chunks/chunkboundsentity.cpp
@@ -30,7 +30,6 @@ class LineMeshGeometry : public Qt3DRender::QGeometry
 
 };
 
-/// @endcond
 
 LineMeshGeometry::LineMeshGeometry( Qt3DCore::QNode *parent )
   : Qt3DRender::QGeometry( parent )
@@ -71,7 +70,6 @@ void LineMeshGeometry::setVertices( QList<QVector3D> vertices )
 
 // ----------------
 
-///@cond PRIVATE
 
 //! Geometry renderer for axis aligned bounding boxes - draws a box edges as lines
 class AABBMesh : public Qt3DRender::QGeometryRenderer
@@ -85,7 +83,6 @@ class AABBMesh : public Qt3DRender::QGeometryRenderer
     LineMeshGeometry *_lineMeshGeo;
 };
 
-/// @endcond
 
 AABBMesh::AABBMesh( Qt3DCore::QNode *parent )
   : Qt3DRender::QGeometryRenderer( parent )
@@ -128,3 +125,5 @@ void ChunkBoundsEntity::setBoxes( const QList<AABB> &bboxes )
 {
   aabbMesh->setBoxes( bboxes );
 }
+
+/// @endcond
diff --git a/src/3d/chunks/chunkboundsentity.h b/src/3d/chunks/chunkboundsentity.h
@@ -6,6 +6,8 @@
 class AABB;
 class AABBMesh;
 
+///@cond PRIVATE
+
 /** \ingroup 3d
  * Draws bounds of axis aligned bounding boxes
  * \since QGIS 3.0
@@ -23,4 +25,6 @@ class ChunkBoundsEntity : public Qt3DCore::QEntity
     AABBMesh *aabbMesh;
 };
 
+/// @endcond
+
 #endif // CHUNKBOUNDSENTITY_H
diff --git a/src/3d/symbols/qgsline3dsymbol_p.cpp b/src/3d/symbols/qgsline3dsymbol_p.cpp
@@ -10,6 +10,7 @@
 #include "qgsmultipolygon.h"
 #include "qgsgeos.h"
 
+/// @cond PRIVATE
 
 QgsLine3DSymbolEntity::QgsLine3DSymbolEntity( const Qgs3DMapSettings &map, QgsVectorLayer *layer, const QgsLine3DSymbol &symbol, Qt3DCore::QNode *parent )
   : Qt3DCore::QEntity( parent )
@@ -133,3 +134,5 @@ Qt3DRender::QGeometryRenderer *QgsLine3DSymbolEntityNode::renderer( const Qgs3DM
 
   return renderer;
 }
+
+/// @endcond
diff --git a/src/3d/symbols/qgspoint3dsymbol_p.cpp b/src/3d/symbols/qgspoint3dsymbol_p.cpp
@@ -33,6 +33,7 @@
 #include "qgspoint.h"
 #include "qgs3dutils.h"
 
+/// @cond PRIVATE
 
 QgsPoint3DSymbolEntity::QgsPoint3DSymbolEntity( const Qgs3DMapSettings &map, QgsVectorLayer *layer, const QgsPoint3DSymbol &symbol, Qt3DCore::QNode *parent )
   : Qt3DCore::QEntity( parent )
@@ -377,3 +378,5 @@ Qt3DCore::QTransform *QgsPoint3DSymbolModelEntityFactory::transform( const QVect
   tr->setTranslation( position + tr->translation() );
   return tr;
 }
+
+/// @endcond
diff --git a/src/3d/symbols/qgspolygon3dsymbol_p.cpp b/src/3d/symbols/qgspolygon3dsymbol_p.cpp
@@ -12,6 +12,7 @@
 #include "qgsmultipolygon.h"
 
 
+/// @cond PRIVATE
 
 QgsPolygon3DSymbolEntity::QgsPolygon3DSymbolEntity( const Qgs3DMapSettings &map, QgsVectorLayer *layer, const QgsPolygon3DSymbol &symbol, Qt3DCore::QNode *parent )
   : Qt3DCore::QEntity( parent )
@@ -142,3 +143,5 @@ Qt3DRender::QGeometryRenderer *QgsPolygon3DSymbolEntityNode::renderer( const Qgs
 
   return renderer;
 }
+
+/// @endcond
diff --git a/src/3d/terrain/flatterraingenerator.cpp b/src/3d/terrain/flatterraingenerator.cpp
@@ -24,8 +24,6 @@ class FlatTerrainChunkLoader : public TerrainChunkLoader
     Qt3DExtras::QPlaneGeometry *mTileGeometry = nullptr;
 };
 
-/// @endcond
-
 
 //---------------
 
@@ -75,6 +73,7 @@ Qt3DCore::QEntity *FlatTerrainChunkLoader::createEntity( Qt3DCore::QEntity *pare
   return entity;
 }
 
+/// @endcond
 
 // ---------------
 
diff --git a/src/3d/terrain/terrain.cpp b/src/3d/terrain/terrain.cpp
@@ -132,6 +132,7 @@ void Terrain::connectToLayersRepaintRequest()
 
 // -----------
 
+///@cond PRIVATE
 
 TerrainMapUpdateJob::TerrainMapUpdateJob( MapTextureGenerator *mapTextureGenerator, ChunkNode *node )
   : ChunkQueueJob( node )
@@ -159,3 +160,5 @@ void TerrainMapUpdateJob::onTileReady( int jobId, const QImage &image )
     emit finished();
   }
 }
+
+/// @endcond

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include "qgsmultipolygon.h"`
`13`	`13`
`14`	`14`
	`15`	`+/// @cond PRIVATE`
`15`	`16`
`16`	`17`	`QgsPolygon3DSymbolEntity::QgsPolygon3DSymbolEntity( const Qgs3DMapSettings &map, QgsVectorLayer layer, const QgsPolygon3DSymbol &symbol, Qt3DCore::QNode parent )`
`17`	`18`	`: Qt3DCore::QEntity( parent )`
`@@ -142,3 +143,5 @@ Qt3DRender::QGeometryRenderer *QgsPolygon3DSymbolEntityNode::renderer( const Qgs`
`142`	`143`
`143`	`144`	`return renderer;`
`144`	`145`	`}`
	`146`	`+`
	`147`	`+/// @endcond`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ void Terrain::connectToLayersRepaintRequest()`
`132`	`132`
`133`	`133`	`// -----------`
`134`	`134`
	`135`	`+///@cond PRIVATE`
`135`	`136`
`136`	`137`	`TerrainMapUpdateJob::TerrainMapUpdateJob( MapTextureGenerator mapTextureGenerator, ChunkNode node )`
`137`	`138`	`: ChunkQueueJob( node )`
`@@ -159,3 +160,5 @@ void TerrainMapUpdateJob::onTileReady( int jobId, const QImage &image )`
`159`	`160`	`emit finished();`
`160`	`161`	`}`
`161`	`162`	`}`
	`163`	`+`
	`164`	`+/// @endcond`