Skip to content

Commit

Permalink
src code layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids
3nids committed Dec 5, 2024
1 parent 6b6bdcc commit 3c0eda3
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 71 deletions.
12 changes: 6 additions & 6 deletions src/core/browser/qgsdataitem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ typedef QgsDataItem *dataItem_t( QString, QgsDataItem * ) SIP_SKIP;
*/
class CORE_EXPORT QgsDataItem : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgslayeritem.h )
SIP_TYPEHEADER_INCLUDE( qgsdirectoryitem.h )
SIP_TYPEHEADER_INCLUDE( qgsfavoritesitem.h )
SIP_TYPEHEADER_INCLUDE( qgszipitem.h )
SIP_TYPEHEADER_INCLUDE( qgsdatacollectionitem.h )
SIP_TYPEHEADER_INCLUDE( qgsprojectitem.h )
SIP_TYPEHEADER_INCLUDE( qgslayeritem.h )
SIP_TYPEHEADER_INCLUDE( qgsdirectoryitem.h )
SIP_TYPEHEADER_INCLUDE( qgsfavoritesitem.h )
SIP_TYPEHEADER_INCLUDE( qgszipitem.h )
SIP_TYPEHEADER_INCLUDE( qgsdatacollectionitem.h )
SIP_TYPEHEADER_INCLUDE( qgsprojectitem.h )

#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
Expand Down
4 changes: 2 additions & 2 deletions src/core/gps/qgsgpsconnection.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ template<class T> class QgsSettingsEntryEnumFlag;
*/
class CORE_EXPORT QgsGpsConnection : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgsgpsdconnection.h )
SIP_TYPEHEADER_INCLUDE( qgsnmeaconnection.h )
SIP_TYPEHEADER_INCLUDE( qgsgpsdconnection.h )
SIP_TYPEHEADER_INCLUDE( qgsnmeaconnection.h )


#ifdef SIP_RUN
Expand Down
2 changes: 1 addition & 1 deletion src/core/layertree/qgslayertreemodellegendnode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class QgsTextDocumentMetrics;
*/
class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgscolorramplegendnode.h )
SIP_TYPEHEADER_INCLUDE( qgscolorramplegendnode.h )

#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
Expand Down
26 changes: 13 additions & 13 deletions src/core/layout/qgslayoutitem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,19 @@ class CORE_EXPORT QgsLayoutItemRenderContext
*/
class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectItem, public QgsLayoutUndoObjectInterface
{
SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h )

#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
Expand Down
8 changes: 4 additions & 4 deletions src/core/layout/qgslayoutmultiframe.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ class QgsLayoutItemRenderContext;

class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutUndoObjectInterface
{
SIP_TYPEHEADER_INCLUDE( qgslayoutitemhtml.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemattributetable.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmanualtable.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemtexttable.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemhtml.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemattributetable.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmanualtable.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemtexttable.h )

#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
Expand Down
28 changes: 14 additions & 14 deletions src/core/layout/qgslayoutobject.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ class QgsReadWriteContext;
*/
class CORE_EXPORT QgsLayoutObject: public QObject, public QgsExpressionContextGenerator
{
SIP_TYPEHEADER_INCLUDE( qgslayoutitem.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitem.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemgroup.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmap.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempicture.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlabel.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemlegend.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolygon.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempolyline.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemscalebar.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutframe.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemshape.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitempage.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemmarker.h )
SIP_TYPEHEADER_INCLUDE( qgslayoutitemelevationprofile.h )

#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
Expand Down
10 changes: 5 additions & 5 deletions src/core/qgsmaplayerelevationproperties.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ class QgsMapLayer;
*/
class CORE_EXPORT QgsMapLayerElevationProperties : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgspointcloudlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsvectorlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsmeshlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgstiledscenelayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgspointcloudlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsvectorlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsmeshlayerelevationproperties.h )
SIP_TYPEHEADER_INCLUDE( qgstiledscenelayerelevationproperties.h )
Q_OBJECT

#ifdef SIP_RUN
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsmaplayerselectionproperties.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*/
class CORE_EXPORT QgsMapLayerSelectionProperties : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgsvectorlayerselectionproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsvectorlayerselectionproperties.h )

Q_OBJECT

Expand Down
6 changes: 3 additions & 3 deletions src/core/qgsmaplayertemporalproperties.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ class QgsDataProviderTemporalCapabilities;
*/
class CORE_EXPORT QgsMapLayerTemporalProperties : public QgsTemporalProperty
{
SIP_TYPEHEADER_INCLUDE( qgsrasterlayertemporalproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsmeshlayertemporalproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsvectorlayertemporalproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterlayertemporalproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsmeshlayertemporalproperties.h )
SIP_TYPEHEADER_INCLUDE( qgsvectorlayertemporalproperties.h )

Q_OBJECT

Expand Down
31 changes: 15 additions & 16 deletions src/core/raster/qgsrasterinterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,23 +135,22 @@ class CORE_EXPORT QgsRasterBlockFeedback : public QgsFeedback
class CORE_EXPORT QgsRasterInterface
{
// QgsRasterInterface subclasses
SIP_TYPEHEADER_INCLUDE( qgsbrightnesscontrastfilter.h )
SIP_TYPEHEADER_INCLUDE( qgshuesaturationfilter.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterdataprovider.h )
SIP_TYPEHEADER_INCLUDE( qgsrasternuller.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterprojector.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterresamplefilter.h )

SIP_TYPEHEADER_INCLUDE( qgsbrightnesscontrastfilter.h )
SIP_TYPEHEADER_INCLUDE( qgshuesaturationfilter.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterdataprovider.h )
SIP_TYPEHEADER_INCLUDE( qgsrasternuller.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterprojector.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsrasterresamplefilter.h )
// QgsRasterRenderer subclasses
SIP_TYPEHEADER_INCLUDE( qgshillshaderenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsmultibandcolorrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgspalettedrasterrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgssinglebandcolordatarenderer.h )
SIP_TYPEHEADER_INCLUDE( qgssinglebandgrayrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgssinglebandpseudocolorrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsrastersinglecolorrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsrastercontourrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgshillshaderenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsmultibandcolorrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgspalettedrasterrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgssinglebandcolordatarenderer.h )
SIP_TYPEHEADER_INCLUDE( qgssinglebandgrayrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgssinglebandpseudocolorrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsrastersinglecolorrenderer.h )
SIP_TYPEHEADER_INCLUDE( qgsrastercontourrenderer.h )


#ifdef SIP_RUN
Expand Down
4 changes: 2 additions & 2 deletions src/core/raster/qgsrasterresampler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class QSize;
*/
class CORE_EXPORT QgsRasterResampler
{
SIP_TYPEHEADER_INCLUDE( qgsbilinearrasterresampler.h )
SIP_TYPEHEADER_INCLUDE( qgscubicrasterresampler.h )
SIP_TYPEHEADER_INCLUDE( qgsbilinearrasterresampler.h )
SIP_TYPEHEADER_INCLUDE( qgscubicrasterresampler.h )


#ifdef SIP_RUN
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrastershaderfunction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ email : ersts@amnh.org

class CORE_EXPORT QgsRasterShaderFunction
{
SIP_TYPEHEADER_INCLUDE( qgscolorrampshader.h )
SIP_TYPEHEADER_INCLUDE( qgscolorrampshader.h )


#ifdef SIP_RUN
Expand Down
4 changes: 2 additions & 2 deletions src/core/sensor/qgsabstractsensor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
*/
class CORE_EXPORT QgsAbstractSensor : public QObject
{
SIP_TYPEHEADER_INCLUDE( qgsiodevicesensor.h )
SIP_TYPEHEADER_INCLUDE( qgssensorregistry.h )
SIP_TYPEHEADER_INCLUDE( qgsiodevicesensor.h )
SIP_TYPEHEADER_INCLUDE( qgssensorregistry.h )


#ifdef SIP_RUN
Expand Down
2 changes: 1 addition & 1 deletion src/core/symbology/qgssymbollayer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ typedef QMap<QString, QString> QgsStringMap;
*/
class CORE_EXPORT QgsSymbolLayer
{
SIP_TYPEHEADER_INCLUDE( qgslinesymbollayer.h )
SIP_TYPEHEADER_INCLUDE( qgslinesymbollayer.h )


#ifdef SIP_RUN
Expand Down

0 comments on commit 3c0eda3

Please sign in to comment.