mirror of
				https://github.com/qgis/QGIS.git
				synced 2025-11-04 00:04:25 -05:00 
			
		
		
		
	Merge pull request #32665 from m-kuhn/fix_qgsfield_private_header
Fix various private header
This commit is contained in:
		
						commit
						c1f2d439cf
					
				@ -31,6 +31,8 @@ legend nodes or whether to collapse them into one legend node.
 | 
			
		||||
Constructor for QgsDataDefinedSizeLegend.
 | 
			
		||||
%End
 | 
			
		||||
 | 
			
		||||
    ~QgsDataDefinedSizeLegend();
 | 
			
		||||
 | 
			
		||||
    QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other );
 | 
			
		||||
%Docstring
 | 
			
		||||
Copy constructor
 | 
			
		||||
 | 
			
		||||
@ -12,6 +12,7 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class QgsField
 | 
			
		||||
{
 | 
			
		||||
%Docstring
 | 
			
		||||
 | 
			
		||||
@ -42,6 +42,7 @@
 | 
			
		||||
#include "qgsnewauxiliarylayerdialog.h"
 | 
			
		||||
#include "qgsauxiliarystorage.h"
 | 
			
		||||
#include "qgsexpressioncontextutils.h"
 | 
			
		||||
#include "qgspropertytransformer.h"
 | 
			
		||||
 | 
			
		||||
#include <QList>
 | 
			
		||||
#include <QMessageBox>
 | 
			
		||||
 | 
			
		||||
@ -723,7 +723,6 @@ SET(QGIS_CORE_HDRS
 | 
			
		||||
  qgsfeaturestore.h
 | 
			
		||||
  qgsfeedback.h
 | 
			
		||||
  qgsfield.h
 | 
			
		||||
  qgsfield_p.h
 | 
			
		||||
  qgsfieldconstraints.h
 | 
			
		||||
  qgsfieldformatter.h
 | 
			
		||||
  qgsfieldformatterregistry.h
 | 
			
		||||
@ -1234,6 +1233,7 @@ SET(QGIS_CORE_PRIVATE_HDRS
 | 
			
		||||
  qgseditformconfig_p.h
 | 
			
		||||
  qgsfeaturefiltermodel_p.h
 | 
			
		||||
  qgsfeature_p.h
 | 
			
		||||
  qgsfield_p.h
 | 
			
		||||
  qgsfields_p.h
 | 
			
		||||
  qgsrelation_p.h
 | 
			
		||||
  qgsspatialindexkdbush_p.h
 | 
			
		||||
 | 
			
		||||
@ -21,6 +21,10 @@
 | 
			
		||||
#include "qgsxmlutils.h"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
QgsDataDefinedSizeLegend::QgsDataDefinedSizeLegend() = default;
 | 
			
		||||
 | 
			
		||||
QgsDataDefinedSizeLegend::~QgsDataDefinedSizeLegend() = default;
 | 
			
		||||
 | 
			
		||||
QgsDataDefinedSizeLegend::QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other )
 | 
			
		||||
  : mType( other.mType )
 | 
			
		||||
  , mTitleLabel( other.mTitleLabel )
 | 
			
		||||
 | 
			
		||||
@ -44,7 +44,9 @@ class CORE_EXPORT QgsDataDefinedSizeLegend
 | 
			
		||||
    /**
 | 
			
		||||
     * Constructor for QgsDataDefinedSizeLegend.
 | 
			
		||||
     */
 | 
			
		||||
    QgsDataDefinedSizeLegend() = default;
 | 
			
		||||
    QgsDataDefinedSizeLegend();
 | 
			
		||||
 | 
			
		||||
    ~QgsDataDefinedSizeLegend();
 | 
			
		||||
 | 
			
		||||
    //! Copy constructor
 | 
			
		||||
    QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other );
 | 
			
		||||
 | 
			
		||||
@ -57,6 +57,8 @@ QgsField::QgsField( const QgsField &other ) //NOLINT
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QgsField::~QgsField() = default;
 | 
			
		||||
 | 
			
		||||
/***************************************************************************
 | 
			
		||||
 * This class is considered CRITICAL and any change MUST be accompanied with
 | 
			
		||||
 * full unit tests in testqgsfield.cpp.
 | 
			
		||||
 | 
			
		||||
@ -20,7 +20,6 @@
 | 
			
		||||
#include <QVariant>
 | 
			
		||||
#include <QVector>
 | 
			
		||||
#include <QSharedDataPointer>
 | 
			
		||||
#include "qgsfield_p.h"
 | 
			
		||||
#include "qgis_core.h"
 | 
			
		||||
#include "qgis_sip.h"
 | 
			
		||||
 | 
			
		||||
@ -36,6 +35,8 @@ typedef QList<int> QgsAttributeList SIP_SKIP;
 | 
			
		||||
#include "qgsfieldconstraints.h"
 | 
			
		||||
#include "qgsdefaultvalue.h"
 | 
			
		||||
 | 
			
		||||
class QgsFieldPrivate;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \class QgsField
 | 
			
		||||
  * \ingroup core
 | 
			
		||||
@ -95,7 +96,7 @@ class CORE_EXPORT QgsField
 | 
			
		||||
     */
 | 
			
		||||
    QgsField &operator =( const QgsField &other ) SIP_SKIP;
 | 
			
		||||
 | 
			
		||||
    virtual ~QgsField() = default;
 | 
			
		||||
    virtual ~QgsField();
 | 
			
		||||
 | 
			
		||||
    bool operator==( const QgsField &other ) const;
 | 
			
		||||
    bool operator!=( const QgsField &other ) const;
 | 
			
		||||
 | 
			
		||||
@ -14,6 +14,7 @@
 | 
			
		||||
 ***************************************************************************/
 | 
			
		||||
 | 
			
		||||
#include "qgsproperty.h"
 | 
			
		||||
#include "qgsproperty_p.h"
 | 
			
		||||
 | 
			
		||||
#include "qgslogger.h"
 | 
			
		||||
#include "qgsexpression.h"
 | 
			
		||||
@ -201,6 +202,8 @@ QgsProperty::QgsProperty()
 | 
			
		||||
  d = new QgsPropertyPrivate();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QgsProperty::~QgsProperty() = default;
 | 
			
		||||
 | 
			
		||||
QgsProperty QgsProperty::fromExpression( const QString &expression, bool isActive )
 | 
			
		||||
{
 | 
			
		||||
  QgsProperty p;
 | 
			
		||||
 | 
			
		||||
@ -17,7 +17,6 @@
 | 
			
		||||
 | 
			
		||||
#include "qgis_core.h"
 | 
			
		||||
#include "qgis_sip.h"
 | 
			
		||||
#include "qgsproperty_p.h"
 | 
			
		||||
#include "qgsexpression.h"
 | 
			
		||||
#include "qgsexpressioncontext.h"
 | 
			
		||||
#include "qgscolorramp.h"
 | 
			
		||||
@ -31,6 +30,7 @@
 | 
			
		||||
#include <QColor>
 | 
			
		||||
 | 
			
		||||
class QgsPropertyTransformer;
 | 
			
		||||
class QgsPropertyPrivate;
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * \ingroup core
 | 
			
		||||
@ -244,7 +244,7 @@ class CORE_EXPORT QgsProperty
 | 
			
		||||
     */
 | 
			
		||||
    QgsProperty();
 | 
			
		||||
 | 
			
		||||
    virtual ~QgsProperty() = default;
 | 
			
		||||
    virtual ~QgsProperty();
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Returns a new ExpressionBasedProperty created from the specified expression.
 | 
			
		||||
 | 
			
		||||
@ -64,6 +64,8 @@ QgsPropertyTransformer &QgsPropertyTransformer::operator=( const QgsPropertyTran
 | 
			
		||||
  return *this;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
QgsPropertyTransformer::~QgsPropertyTransformer() = default;
 | 
			
		||||
 | 
			
		||||
bool QgsPropertyTransformer::loadVariant( const QVariant &transformer )
 | 
			
		||||
{
 | 
			
		||||
  QVariantMap transformerMap = transformer.toMap();
 | 
			
		||||
 | 
			
		||||
@ -212,7 +212,7 @@ class CORE_EXPORT QgsPropertyTransformer
 | 
			
		||||
    QgsPropertyTransformer( const QgsPropertyTransformer &other );
 | 
			
		||||
    QgsPropertyTransformer &operator=( const QgsPropertyTransformer &other );
 | 
			
		||||
 | 
			
		||||
    virtual ~QgsPropertyTransformer() = default;
 | 
			
		||||
    virtual ~QgsPropertyTransformer();
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Returns the transformer type.
 | 
			
		||||
 | 
			
		||||
@ -23,7 +23,6 @@
 | 
			
		||||
#include "qgsdataitem.h"
 | 
			
		||||
#include "qgsbrowsertreeview.h"
 | 
			
		||||
#include "qgsdockwidget.h"
 | 
			
		||||
#include "qgsbrowserdockwidget_p.h"
 | 
			
		||||
#include "qgis_gui.h"
 | 
			
		||||
#include <QSortFilterProxyModel>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -42,6 +42,7 @@
 | 
			
		||||
#include "qgsgeometry.h"
 | 
			
		||||
#include "qgsdiagramrenderer.h"
 | 
			
		||||
#include "diagram/qgspiediagram.h"
 | 
			
		||||
#include "qgspropertytransformer.h"
 | 
			
		||||
 | 
			
		||||
static QString _fileNameForTest( const QString &testName )
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
@ -22,6 +22,7 @@
 | 
			
		||||
#include "qgsapplication.h"
 | 
			
		||||
#include "qgscolorramp.h"
 | 
			
		||||
#include "qgssymbollayerutils.h"
 | 
			
		||||
#include "qgspropertytransformer.h"
 | 
			
		||||
#include <QObject>
 | 
			
		||||
 | 
			
		||||
enum PropertyKeys
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user