Skip to content
Permalink
Browse files

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
  • Loading branch information
3nids committed Oct 5, 2018
1 parent 8f4d3ba commit 9fa8c356ddf509fa1cd42c6d0756a0d8b027ec9b
@@ -0,0 +1,2 @@
# The following has been generated automatically from src/core/geometry/qgswkbtypes.h
QgsWkbTypes.GeometryType.baseClass = QgsWkbTypes
@@ -23,6 +23,9 @@ Handles storage of information regarding WKB types and their properties.
%TypeHeaderCode
#include "qgswkbtypes.h"
%End
public:
static const QMetaObject staticMetaObject;

public:

enum Type
@@ -11,7 +11,6 @@




class QgsDataItem : QObject
{
%Docstring
@@ -295,7 +295,6 @@
%Include auto_generated/geometry/qgstriangle.sip
%Include auto_generated/geometry/qgssurface.sip
%Include auto_generated/geometry/qgswkbptr.sip
%Include auto_generated/geometry/qgswkbtypes.sip
%Include auto_generated/./3d/qgs3drendererregistry.sip
%Include auto_generated/./3d/qgsabstract3drenderer.sip
%Include auto_generated/fieldformatter/qgsrangefieldformatter.sip
@@ -396,6 +395,7 @@
%Include auto_generated/geometry/qgsabstractgeometry.sip
%Include auto_generated/geometry/qgsgeometry.sip
%Include auto_generated/geometry/qgspoint.sip
%Include auto_generated/geometry/qgswkbtypes.sip
%Include auto_generated/geocms/geonode/qgsgeonoderequest.sip
%Include auto_generated/gps/qgsgpsconnection.sip
%Include auto_generated/gps/qgsgpsdetector.sip
@@ -700,6 +700,7 @@ SET(QGIS_CORE_MOC_HDRS
geometry/qgsabstractgeometry.h
geometry/qgsgeometry.h
geometry/qgspoint.h
geometry/qgswkbtypes.h

geocms/geonode/qgsgeonoderequest.h

@@ -1160,7 +1161,6 @@ SET(QGIS_CORE_HDRS
geometry/qgstriangle.h
geometry/qgssurface.h
geometry/qgswkbptr.h
geometry/qgswkbtypes.h

3d/qgs3drendererregistry.h
3d/qgsabstract3drenderer.h
@@ -18,11 +18,11 @@
#ifndef QGSWKBTYPES_H
#define QGSWKBTYPES_H

#include <QObject>
#include <QMap>
#include <QString>

#include "qgis_core.h"
#include "qgis.h"

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

class CORE_EXPORT QgsWkbTypes
{
Q_GADGET
public:

/**
@@ -142,6 +143,7 @@ class CORE_EXPORT QgsWkbTypes
UnknownGeometry,
NullGeometry
};
Q_ENUM( GeometryType )

/**
* Returns the single type for a WKB type. For example, for MultiPolygon WKB types the single type would be Polygon.
@@ -33,7 +33,7 @@
#include "qgsmaplayer.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsmimedatautils.h"

#include "qgswkbtypes.h"

class QgsDataProvider;
class QgsDataItem;
@@ -17,7 +17,7 @@

#include "qgsdataitem.h"
#include "qgsdatasourceuri.h"

#include "qgswkbtypes.h"

class QgsAfsRootItem : public QgsDataCollectionItem
{
@@ -19,6 +19,7 @@

#include "qgsdataitem.h"
#include "qgsdatasourceuri.h"
#include "qgswkbtypes.h"


class QgsAmsRootItem : public QgsDataCollectionItem
@@ -17,6 +17,8 @@

#include "qgsdataitem.h"
#include "qgsdatasourceuri.h"
#include "qgswkbtypes.h"

class QgsOWSConnectionItem : public QgsDataCollectionItem
{
Q_OBJECT
@@ -22,6 +22,7 @@
#include "qgspostgresconn.h"
#include "qgsmimedatautils.h"
#include "qgsvectorlayerexporter.h"
#include "qgswkbtypes.h"

class QgsPGRootItem;
class QgsPGConnectionItem;

0 comments on commit 9fa8c35

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