Skip to content

Commit 9fa8c35

Browse files
authored
make QgsWkbTypes a Q_GADGET and declare GeometryType as Q_ENUM (#8024)
* make QgsWkbTypes a Q_GADGET and declare GeometryType as Q_ENUM * include QObject * remove extra include * move QgsWkbTypes to moc headers * run sip_include
1 parent 8f4d3ba commit 9fa8c35

File tree

11 files changed

+16
-6
lines changed

11 files changed

+16
-6
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# The following has been generated automatically from src/core/geometry/qgswkbtypes.h
2+
QgsWkbTypes.GeometryType.baseClass = QgsWkbTypes

python/core/auto_generated/geometry/qgswkbtypes.sip.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ Handles storage of information regarding WKB types and their properties.
2323
%TypeHeaderCode
2424
#include "qgswkbtypes.h"
2525
%End
26+
public:
27+
static const QMetaObject staticMetaObject;
28+
2629
public:
2730

2831
enum Type

python/core/auto_generated/qgsdataitem.sip.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212

1313

14-
1514
class QgsDataItem : QObject
1615
{
1716
%Docstring

python/core/core_auto.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@
295295
%Include auto_generated/geometry/qgstriangle.sip
296296
%Include auto_generated/geometry/qgssurface.sip
297297
%Include auto_generated/geometry/qgswkbptr.sip
298-
%Include auto_generated/geometry/qgswkbtypes.sip
299298
%Include auto_generated/./3d/qgs3drendererregistry.sip
300299
%Include auto_generated/./3d/qgsabstract3drenderer.sip
301300
%Include auto_generated/fieldformatter/qgsrangefieldformatter.sip
@@ -396,6 +395,7 @@
396395
%Include auto_generated/geometry/qgsabstractgeometry.sip
397396
%Include auto_generated/geometry/qgsgeometry.sip
398397
%Include auto_generated/geometry/qgspoint.sip
398+
%Include auto_generated/geometry/qgswkbtypes.sip
399399
%Include auto_generated/geocms/geonode/qgsgeonoderequest.sip
400400
%Include auto_generated/gps/qgsgpsconnection.sip
401401
%Include auto_generated/gps/qgsgpsdetector.sip

src/core/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,6 +700,7 @@ SET(QGIS_CORE_MOC_HDRS
700700
geometry/qgsabstractgeometry.h
701701
geometry/qgsgeometry.h
702702
geometry/qgspoint.h
703+
geometry/qgswkbtypes.h
703704

704705
geocms/geonode/qgsgeonoderequest.h
705706

@@ -1160,7 +1161,6 @@ SET(QGIS_CORE_HDRS
11601161
geometry/qgstriangle.h
11611162
geometry/qgssurface.h
11621163
geometry/qgswkbptr.h
1163-
geometry/qgswkbtypes.h
11641164

11651165
3d/qgs3drendererregistry.h
11661166
3d/qgsabstract3drenderer.h

src/core/geometry/qgswkbtypes.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
#ifndef QGSWKBTYPES_H
1919
#define QGSWKBTYPES_H
2020

21+
#include <QObject>
2122
#include <QMap>
2223
#include <QString>
2324

2425
#include "qgis_core.h"
25-
#include "qgis.h"
2626

2727
/***************************************************************************
2828
* This class is considered CRITICAL and any change MUST be accompanied with
@@ -39,6 +39,7 @@
3939

4040
class CORE_EXPORT QgsWkbTypes
4141
{
42+
Q_GADGET
4243
public:
4344

4445
/**
@@ -142,6 +143,7 @@ class CORE_EXPORT QgsWkbTypes
142143
UnknownGeometry,
143144
NullGeometry
144145
};
146+
Q_ENUM( GeometryType )
145147

146148
/**
147149
* Returns the single type for a WKB type. For example, for MultiPolygon WKB types the single type would be Polygon.

src/core/qgsdataitem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "qgsmaplayer.h"
3434
#include "qgscoordinatereferencesystem.h"
3535
#include "qgsmimedatautils.h"
36-
36+
#include "qgswkbtypes.h"
3737

3838
class QgsDataProvider;
3939
class QgsDataItem;

src/providers/arcgisrest/qgsafsdataitems.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "qgsdataitem.h"
1919
#include "qgsdatasourceuri.h"
20-
20+
#include "qgswkbtypes.h"
2121

2222
class QgsAfsRootItem : public QgsDataCollectionItem
2323
{

src/providers/arcgisrest/qgsamsdataitems.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include "qgsdataitem.h"
2121
#include "qgsdatasourceuri.h"
22+
#include "qgswkbtypes.h"
2223

2324

2425
class QgsAmsRootItem : public QgsDataCollectionItem

src/providers/ows/qgsowsdataitems.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
#include "qgsdataitem.h"
1919
#include "qgsdatasourceuri.h"
20+
#include "qgswkbtypes.h"
21+
2022
class QgsOWSConnectionItem : public QgsDataCollectionItem
2123
{
2224
Q_OBJECT

src/providers/postgres/qgspostgresdataitems.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "qgspostgresconn.h"
2323
#include "qgsmimedatautils.h"
2424
#include "qgsvectorlayerexporter.h"
25+
#include "qgswkbtypes.h"
2526

2627
class QgsPGRootItem;
2728
class QgsPGConnectionItem;

0 commit comments

Comments
 (0)