Skip to content

Commit d000157

Browse files
committed
forward declarations for QgsMapLayer
1 parent f86b86b commit d000157

13 files changed

+19
-9
lines changed

python/core/auto_generated/qgsmaplayerstylemanager.sip.in

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212

1313

14+
1415
class QgsMapLayerStyleManager : QObject
1516
{
1617
%Docstring

python/gui/auto_generated/qgsmetadatawidget.sip.in

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111

1212

13+
1314
class QgsMetadataWidget : QWidget
1415
{
1516
%Docstring

src/app/vertextool/qgsvertexentry.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
***************************************************************************/
1515

1616
#include "vertextool/qgsvertexentry.h"
17+
#include "qgsmaplayer.h"
18+
#include "qgsmapcanvas.h"
1719

1820
QgsVertexEntry::QgsVertexEntry( QgsMapCanvas *canvas, QgsMapLayer *layer, const QgsPoint &p, QgsVertexId vertexId, const QString &tooltip, QgsVertexMarker::IconType type, int penWidth )
1921
: mSelected( false )

src/app/vertextool/qgsvertexentry.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818

1919
#include "qgspoint.h"
2020
#include "qgsvertexmarker.h"
21-
#include "qgsmapcanvas.h"
22-
#include "qgsmaplayer.h"
21+
22+
class QgsMapLayer;
23+
class QgsMapCanvas;
2324

2425
class QgsVertexEntry
2526
{

src/core/layertree/qgslayertreemodel.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "qgsdataitem.h"
2727
#include "qgsmaphittest.h"
28+
#include "qgsmaplayer.h"
2829
#include "qgsmaplayerlegend.h"
2930
#include "qgsmaplayerstylemanager.h"
3031
#include "qgspluginlayer.h"

src/core/layertree/qgslayertreemodel.h

-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@
2424
#include <memory>
2525

2626
#include "qgsgeometry.h"
27-
#include "qgsmaplayer.h"
2827
#include "qgslayertreemodellegendnode.h"
2928

3029
class QgsLayerTreeNode;
3130
class QgsLayerTreeGroup;
3231
class QgsLayerTreeLayer;
3332
class QgsMapHitTest;
34-
class QgsMapLayer;
3533
class QgsMapSettings;
3634
class QgsExpression;
3735
class QgsRenderContext;

src/core/qgsmaplayerstyle.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#include "qgsmaplayerstyle.h"
1717
#include "qgsmaplayerstylemanager.h"
1818
#include "qgsreadwritecontext.h"
19+
#include "qgsmaplayer.h"
20+
1921

2022
#include "qgslogger.h"
2123

src/core/qgsmaplayerstylemanager.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "qgsmaplayerstylemanager.h"
1717
#include "qgsmaplayerstyle.h"
18+
#include "qgsmaplayer.h"
1819

1920
#include "qgslogger.h"
2021

src/core/qgsmaplayerstylemanager.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include "qgis_core.h"
2020
#include "qgis_sip.h"
21-
#include "qgsmaplayer.h"
2221
#include "qgsmaplayerstyle.h"
2322

2423
#include <QByteArray>
@@ -29,6 +28,8 @@
2928

3029
class QDomElement;
3130

31+
class QgsMapLayer;
32+
3233
/**
3334
* \ingroup core
3435
* Management of styles for use with one map layer. Stored styles are identified by their names. The manager

src/core/qgsproject.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include "qgscoordinatereferencesystem.h"
4141
#include "qgscoordinatetransformcontext.h"
4242
#include "qgsprojectproperty.h"
43-
#include "qgsmaplayer.h"
4443
#include "qgsmaplayerstore.h"
4544
#include "qgsarchive.h"
4645
#include "qgsreadwritecontext.h"
@@ -70,6 +69,7 @@ class QgsLayoutManager;
7069
class QgsLayerTree;
7170
class QgsLabelingEngineSettings;
7271
class QgsAuxiliaryStorage;
72+
class QgsMapLayer;
7373

7474
/**
7575
* \ingroup core

src/gui/qgsmetadatawidget.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@
2323
#include "qgis_gui.h"
2424
#include "qgscoordinatereferencesystem.h"
2525
#include "qgsdataprovider.h"
26-
#include "qgsmaplayer.h"
2726
#include "qgslayermetadata.h"
2827
#include "ui_qgsmetadatawidget.h"
2928

29+
class QgsMapLayer;
30+
3031
/**
3132
* \ingroup gui
3233
* \class QgsMetadataWidget

src/plugins/evis/idtool/eviseventidtool.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@
3030
#include <QMouseEvent>
3131
#include <QWidget>
3232

33-
#include "qgsmaplayer.h"
3433
#include "qgsmaptool.h"
3534
#include "qgsmapcanvas.h"
3635
#include "qgspointxy.h"
3736

3837
#include "evisgenericeventbrowsergui.h"
3938

39+
class QgsMapLayer;
40+
4041
/**
4142
* \class eVisEventIdTool
4243
* \brief Map tool for launching event browser

src/server/services/wms/qgslayerrestorer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include <QList>
2222

23-
#include "qgsmaplayer.h"
23+
class QgsMapLayer;
2424

2525
/**
2626
* \ingroup server

0 commit comments

Comments
 (0)