follow up + some forward declarations

qgis · Jan 12, 2021 · aac558d · aac558d
1 parent a6404da
commit aac558d
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 7 deletions.
diff --git a/python/core/auto_generated/editform/qgsattributeeditorrelation.sip.in b/python/core/auto_generated/editform/qgsattributeeditorrelation.sip.in
@@ -7,6 +7,7 @@
  ************************************************************************/
 
 
+
 class QgsAttributeEditorRelation : QgsAttributeEditorElement
 {
 %Docstring

diff --git a/src/analysis/processing/qgsalgorithmflattenrelationships.h b/src/analysis/processing/qgsalgorithmflattenrelationships.h
@@ -22,6 +22,7 @@
 
 #include "qgis_sip.h"
 #include "qgsprocessingalgorithm.h"
+#include "qgsrelation.h"
 
 class QgsVectorLayerFeatureSource;
 

diff --git a/src/core/editform/qgsattributeeditorcontainer.cpp b/src/core/editform/qgsattributeeditorcontainer.cpp
@@ -17,6 +17,11 @@
 #include "qgsattributeeditorcontainer.h"
 
 
+QgsAttributeEditorContainer::~QgsAttributeEditorContainer()
+{
+  qDeleteAll( mChildren );
+}
+
 void QgsAttributeEditorContainer::addChildElement( QgsAttributeEditorElement *widget )
 {
   mChildren.append( widget );

diff --git a/src/core/editform/qgsattributeeditorrelation.h b/src/core/editform/qgsattributeeditorrelation.h
@@ -23,6 +23,8 @@
 #include "qgspropertycollection.h"
 #include <QColor>
 
+class QgsRelationManager;
+
 /**
  * \ingroup core
  * This element will load a relation editor onto the form.

diff --git a/src/core/editform/qgseditformconfig.cpp b/src/core/editform/qgseditformconfig.cpp
@@ -12,6 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+
 #include "qgseditformconfig_p.h"
 #include "qgseditformconfig.h"
 #include "qgsnetworkcontentfetcherregistry.h"
@@ -23,13 +24,11 @@
 #include "qgsxmlutils.h"
 #include "qgsapplication.h"
 #include "qgsmessagelog.h"
+#include "qgsattributeeditorcontainer.h"
+#include "qgsattributeeditorfield.h"
+#include "qgsattributeeditorrelation.h"
 
 
-QgsAttributeEditorContainer::~QgsAttributeEditorContainer()
-{
-  qDeleteAll( mChildren );
-}
-
 QgsEditFormConfig::QgsEditFormConfig()
   : d( new QgsEditFormConfigPrivate() )
 {

diff --git a/src/core/editform/qgseditformconfig.h b/src/core/editform/qgseditformconfig.h
@@ -29,6 +29,7 @@
 
 class QgsRelationManager;
 class QgsEditFormConfigPrivate;
+class QgsAttributeEditorContainer;
 
 /**
  * \ingroup core

diff --git a/src/core/editform/qgseditformconfig_p.h b/src/core/editform/qgseditformconfig_p.h
@@ -19,6 +19,7 @@
 #include <QMap>
 #include "qgsfields.h"
 #include "qgseditformconfig.h"
+#include "qgsattributeeditorcontainer.h"
 
 /// @cond PRIVATE
 

diff --git a/src/core/project/qgsproject.cpp b/src/core/project/qgsproject.cpp
@@ -63,6 +63,8 @@
 #include "qgsruntimeprofiler.h"
 #include "qgsannotationlayer.h"
 #include "qgspointcloudlayer.h"
+#include "qgsattributeeditorcontainer.h"
+
 
 #include <algorithm>
 #include <QApplication>

diff --git a/src/core/project/qgsproject.h b/src/core/project/qgsproject.h
@@ -46,9 +46,10 @@
 #include "qgsprojectmetadata.h"
 #include "qgstranslationcontext.h"
 #include "qgsprojecttranslator.h"
-#include "qgsattributeeditorelement.h"
 #include "qgscolorscheme.h"
 #include "qgssettings.h"
+#include "qgspropertycollection.h"
+
 
 class QFileInfo;
 class QDomDocument;
@@ -77,6 +78,8 @@ class QgsProjectViewSettings;
 class QgsProjectDisplaySettings;
 class QgsProjectTimeSettings;
 class QgsAnnotationLayer;
+class QgsAttributeEditorContainer;
+class QgsPropertyCollection;
 
 
 /**

diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include "qgssnappingutils.h"
-
 #include "qgsgeometry.h"
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"

diff --git a/src/gui/vector/qgsattributesformproperties.h b/src/gui/vector/qgsattributesformproperties.h
@@ -46,6 +46,8 @@
 #include "qgseditorwidgetfactory.h"
 #include "qgseditorwidgetregistry.h"
 #include "qgsrelationmanager.h"
+#include "qgsattributeeditorrelation.h"
+
 
 class QgsAttributesDnDTree;
 class QgsAttributeFormContainerEdit;