Skip to content

Commit

Permalink
Forward declare some classes
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Dec 17, 2017
1 parent fb712d7 commit c496b3b
Show file tree
Hide file tree
Showing 38 changed files with 56 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/app/layout/qgslayoutaddpagesdialog.cpp
View file
Expand Up @@ -18,6 +18,7 @@
#include "qgssettings.h"
#include "qgslayout.h"
#include "qgslayoutmeasurementconverter.h"
#include "qgslayoutpagecollection.h"

QgsLayoutAddPagesDialog::QgsLayoutAddPagesDialog( QWidget *parent, Qt::WindowFlags flags )
: QDialog( parent, flags )
Expand Down
2 changes: 2 additions & 0 deletions src/app/layout/qgslayoutappmenuprovider.cpp
View file
Expand Up @@ -18,6 +18,8 @@
#include "qgslayoutitemgroup.h"
#include "qgslayoutdesignerdialog.h"
#include "qgslayout.h"
#include "qgslayoutundostack.h"
#include "qgslayoutpagecollection.h"
#include <QMenu>
#include <QMessageBox>

Expand Down
2 changes: 2 additions & 0 deletions src/app/layout/qgslayoutdesignerdialog.cpp
View file
Expand Up @@ -48,6 +48,8 @@
#include "qgslayoutitemslistview.h"
#include "qgsproject.h"
#include "qgsbusyindicatordialog.h"
#include "qgslayoutundostack.h"
#include "qgslayoutpagecollection.h"
#include <QShortcut>
#include <QComboBox>
#include <QLineEdit>
Expand Down
2 changes: 2 additions & 0 deletions src/app/layout/qgslayoutguidewidget.cpp
View file
Expand Up @@ -19,6 +19,8 @@
#include "qgslayoutview.h"
#include "qgsdoublespinbox.h"
#include "qgslayoutunitscombobox.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"

QgsLayoutGuideWidget::QgsLayoutGuideWidget( QWidget *parent, QgsLayout *layout, QgsLayoutView *layoutView )
: QgsPanelWidget( parent )
Expand Down
1 change: 1 addition & 0 deletions src/app/layout/qgslayouthtmlwidget.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgscodeeditorhtml.h"
#include "qgscodeeditorcss.h"
#include "qgssettings.h"
#include "qgslayoutundostack.h"

#include <QFileDialog>

Expand Down
1 change: 1 addition & 0 deletions src/app/layout/qgslayoutmapwidget.cpp
View file
Expand Up @@ -28,6 +28,7 @@
#include "qgssymbollayerutils.h"
#include "qgslayoutmapgridwidget.h"
#include "qgsstyle.h"
#include "qgslayoutundostack.h"
#include <QMenu>
#include <QMessageBox>

Expand Down
2 changes: 2 additions & 0 deletions src/app/layout/qgslayoutpagepropertieswidget.cpp
View file
Expand Up @@ -18,6 +18,8 @@
#include "qgspagesizeregistry.h"
#include "qgslayoutitempage.h"
#include "qgslayout.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"

QgsLayoutPagePropertiesWidget::QgsLayoutPagePropertiesWidget( QWidget *parent, QgsLayoutItem *layoutItem )
: QgsLayoutItemBaseWidget( parent, layoutItem )
Expand Down
1 change: 1 addition & 0 deletions src/app/layout/qgslayoutpolygonwidget.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgslayout.h"
#include "qgssymbollayerutils.h"
#include "qgslayoutitemregistry.h"
#include "qgslayoutundostack.h"

QgsLayoutPolygonWidget::QgsLayoutPolygonWidget( QgsLayoutItemPolygon *polygon )
: QgsLayoutItemBaseWidget( nullptr, polygon )
Expand Down
1 change: 1 addition & 0 deletions src/app/layout/qgslayoutpolylinewidget.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgssymbollayerutils.h"
#include "qgslayoutitemregistry.h"
#include "qgslayout.h"
#include "qgslayoutundostack.h"
#include <QFileDialog>

QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polyline )
Expand Down
1 change: 1 addition & 0 deletions src/app/layout/qgslayoutpropertieswidget.cpp
View file
Expand Up @@ -17,6 +17,7 @@
#include "qgslayoutpropertieswidget.h"
#include "qgslayout.h"
#include "qgslayoutsnapper.h"
#include "qgslayoutpagecollection.h"

QgsLayoutPropertiesWidget::QgsLayoutPropertiesWidget( QWidget *parent, QgsLayout *layout )
: QgsPanelWidget( parent )
Expand Down
1 change: 1 addition & 0 deletions src/core/layout/qgslayout.cpp
View file
Expand Up @@ -25,6 +25,7 @@
#include "qgslayoutitemgroup.h"
#include "qgslayoutitemgroupundocommand.h"
#include "qgslayoutmultiframe.h"
#include "qgslayoutundostack.h"

QgsLayout::QgsLayout( QgsProject *project )
: mProject( project )
Expand Down
4 changes: 2 additions & 2 deletions src/core/layout/qgslayout.h
View file
Expand Up @@ -21,15 +21,15 @@
#include "qgslayoutcontext.h"
#include "qgslayoutsnapper.h"
#include "qgsexpressioncontextgenerator.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutgridsettings.h"
#include "qgslayoutguidecollection.h"
#include "qgslayoutundostack.h"
#include "qgslayoutexporter.h"

class QgsLayoutItemMap;
class QgsLayoutModel;
class QgsLayoutMultiFrame;
class QgsLayoutPageCollection;
class QgsLayoutUndoStack;

/**
* \ingroup core
Expand Down
1 change: 1 addition & 0 deletions src/core/layout/qgslayoutaligner.cpp
View file
Expand Up @@ -17,6 +17,7 @@
#include "qgslayoutaligner.h"
#include "qgslayoutitem.h"
#include "qgslayout.h"
#include "qgslayoutundostack.h"

void QgsLayoutAligner::alignItems( QgsLayout *layout, const QList<QgsLayoutItem *> &items, QgsLayoutAligner::Alignment alignment )
{
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutexporter.cpp
View file
Expand Up @@ -16,6 +16,8 @@

#include "qgslayoutexporter.h"
#include "qgslayout.h"
#include "qgslayoutitemmap.h"
#include "qgslayoutpagecollection.h"

QgsLayoutExporter::QgsLayoutExporter( QgsLayout *layout )
: mLayout( layout )
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutgridsettings.cpp
View file
Expand Up @@ -18,6 +18,8 @@
#include "qgsreadwritecontext.h"
#include "qgslayout.h"
#include "qgsproject.h"
#include "qgslayoutundostack.h"
#include "qgslayoutpagecollection.h"

QgsLayoutGridSettings::QgsLayoutGridSettings( QgsLayout *layout )
: mGridResolution( QgsLayoutMeasurement( 10 ) )
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutguidecollection.cpp
View file
Expand Up @@ -18,6 +18,8 @@
#include "qgslayout.h"
#include "qgsproject.h"
#include "qgsreadwritecontext.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"
#include <QGraphicsLineItem>


Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutitem.cpp
View file
Expand Up @@ -24,6 +24,8 @@
#include "qgslayoutitemgroup.h"
#include "qgspainting.h"
#include "qgslayouteffect.h"
#include "qgslayoutundostack.h"
#include "qgslayoutpagecollection.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>
#include <QUuid>
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutitemgroup.cpp
View file
Expand Up @@ -18,6 +18,8 @@
#include "qgslayoutitemregistry.h"
#include "qgslayout.h"
#include "qgslayoututils.h"
#include "qgslayoutundostack.h"
#include "qgslayoutpagecollection.h"

QgsLayoutItemGroup::QgsLayoutItemGroup( QgsLayout *layout )
: QgsLayoutItem( layout )
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutitempage.cpp
View file
Expand Up @@ -20,6 +20,8 @@
#include "qgspagesizeregistry.h"
#include "qgssymbollayerutils.h"
#include "qgslayoutitemundocommand.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"
#include <QPainter>
#include <QStyleOptionGraphicsItem>

Expand Down
1 change: 1 addition & 0 deletions src/core/layout/qgslayoutitemundocommand.cpp
View file
Expand Up @@ -20,6 +20,7 @@
#include "qgsreadwritecontext.h"
#include "qgslayout.h"
#include "qgsproject.h"
#include "qgslayoutundostack.h"

///@cond PRIVATE
QgsLayoutItemUndoCommand::QgsLayoutItemUndoCommand( QgsLayoutItem *item, const QString &text, int id, QUndoCommand *parent )
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutmultiframe.cpp
View file
Expand Up @@ -17,6 +17,8 @@
#include "qgslayoutmultiframeundocommand.h"
#include "qgslayoutframe.h"
#include "qgslayout.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"
#include <QtCore>

QgsLayoutMultiFrame::QgsLayoutMultiFrame( QgsLayout *layout )
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutpagecollection.cpp
View file
Expand Up @@ -20,6 +20,8 @@
#include "qgsproject.h"
#include "qgslayoutitemundocommand.h"
#include "qgssymbollayerutils.h"
#include "qgslayoutframe.h"
#include "qgslayoutundostack.h"

QgsLayoutPageCollection::QgsLayoutPageCollection( QgsLayout *layout )
: QObject( layout )
Expand Down
2 changes: 2 additions & 0 deletions src/core/layout/qgslayoutpagecollection.h
View file
Expand Up @@ -20,7 +20,9 @@
#include "qgis_core.h"
#include "qgis_sip.h"
#include "qgssymbol.h"
#include "qgslayout.h"
#include "qgslayoutitempage.h"
#include "qgslayoutitem.h"
#include "qgslayoutserializableobject.h"
#include <QObject>
#include <memory>
Expand Down
1 change: 1 addition & 0 deletions src/core/layout/qgslayoutsnapper.cpp
View file
Expand Up @@ -18,6 +18,7 @@
#include "qgslayout.h"
#include "qgsreadwritecontext.h"
#include "qgsproject.h"
#include "qgslayoutpagecollection.h"

QgsLayoutSnapper::QgsLayoutSnapper( QgsLayout *layout )
: mLayout( layout )
Expand Down
1 change: 1 addition & 0 deletions src/core/layout/qgslayouttable.cpp
View file
Expand Up @@ -23,6 +23,7 @@
#include "qgslayoutframe.h"
#include "qgsfontutils.h"
#include "qgssettings.h"
#include "qgslayoutpagecollection.h"

//
// QgsLayoutTableStyle
Expand Down
1 change: 1 addition & 0 deletions src/gui/layout/qgslayoutitemwidget.cpp
View file
Expand Up @@ -17,6 +17,7 @@
#include "qgspropertyoverridebutton.h"
#include "qgslayout.h"
#include "qgsproject.h"
#include "qgslayoutundostack.h"

//
// QgsLayoutConfigObject
Expand Down
1 change: 1 addition & 0 deletions src/gui/layout/qgslayoutmousehandles.cpp
View file
Expand Up @@ -26,6 +26,7 @@
#include "qgslayoutviewtoolselect.h"
#include "qgslayoutsnapper.h"
#include "qgslayoutitemgroup.h"
#include "qgslayoutundostack.h"
#include <QGraphicsView>
#include <QGraphicsSceneHoverEvent>
#include <QPainter>
Expand Down
2 changes: 1 addition & 1 deletion src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
View file
Expand Up @@ -16,7 +16,7 @@
#include "qgslayoutnewitempropertiesdialog.h"
#include "qgssettings.h"
#include "qgslayout.h"

#include "qgslayoutpagecollection.h"

QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Qt::WindowFlags flags )
: QDialog( parent, flags )
Expand Down
1 change: 1 addition & 0 deletions src/gui/layout/qgslayoutruler.cpp
View file
Expand Up @@ -17,6 +17,7 @@
#include "qgis.h"
#include "qgslayoutview.h"
#include "qgslogger.h"
#include "qgslayoutpagecollection.h"
#include <QDragEnterEvent>
#include <QGraphicsLineItem>
#include <QPainter>
Expand Down
2 changes: 2 additions & 0 deletions src/gui/layout/qgslayoutview.cpp
View file
Expand Up @@ -31,6 +31,8 @@
#include "qgslayoutitemundocommand.h"
#include "qgsproject.h"
#include "qgslayoutitemgroup.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"
#include <memory>
#include <QDesktopWidget>
#include <QMenu>
Expand Down
1 change: 1 addition & 0 deletions src/gui/layout/qgslayoutviewtooladditem.cpp
View file
Expand Up @@ -25,6 +25,7 @@
#include "qgslayoutitemguiregistry.h"
#include "qgslayoutnewitempropertiesdialog.h"
#include "qgssettings.h"
#include "qgslayoutundostack.h"
#include <QGraphicsRectItem>
#include <QPen>
#include <QBrush>
Expand Down
1 change: 1 addition & 0 deletions src/gui/layout/qgslayoutviewtooleditnodes.cpp
View file
Expand Up @@ -18,6 +18,7 @@
#include "qgslayoutview.h"
#include "qgslayout.h"
#include "qgslayoutitemnodeitem.h"
#include "qgslayoutundostack.h"

QgsLayoutViewToolEditNodes::QgsLayoutViewToolEditNodes( QgsLayoutView *view )
: QgsLayoutViewTool( view, tr( "Select" ) )
Expand Down
1 change: 1 addition & 0 deletions src/gui/layout/qgslayoutviewtoolmoveitemcontent.cpp
View file
Expand Up @@ -19,6 +19,7 @@
#include "qgslayout.h"
#include "qgslayoutitemnodeitem.h"
#include "qgssettings.h"
#include "qgslayoutundostack.h"

QgsLayoutViewToolMoveItemContent::QgsLayoutViewToolMoveItemContent( QgsLayoutView *view )
: QgsLayoutViewTool( view, tr( "Select" ) )
Expand Down
2 changes: 2 additions & 0 deletions tests/src/core/testqgslayout.cpp
View file
Expand Up @@ -20,6 +20,8 @@
#include "qgsproject.h"
#include "qgslayoutitemmap.h"
#include "qgslayoutitemshape.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"

class TestQgsLayout: public QObject
{
Expand Down
2 changes: 2 additions & 0 deletions tests/src/core/testqgslayoutitem.cpp
View file
Expand Up @@ -27,6 +27,8 @@
#include "qgslayoutitemshape.h"
#include "qgslayouteffect.h"
#include "qgsfillsymbollayer.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"
#include <QObject>
#include <QPainter>
#include <QImage>
Expand Down
1 change: 1 addition & 0 deletions tests/src/core/testqgslayoutitemgroup.cpp
View file
Expand Up @@ -26,6 +26,7 @@
#include "qgslogger.h"
#include "qgsproject.h"
#include "qgsfillsymbollayer.h"
#include "qgslayoutundostack.h"

#include <QObject>
#include <QtTest/QSignalSpy>
Expand Down
2 changes: 2 additions & 0 deletions tests/src/core/testqgslayoutmultiframe.cpp
View file
Expand Up @@ -23,6 +23,8 @@
#include "qgsapplication.h"
#include "qgsproject.h"
#include "qgslayoutitemhtml.h"
#include "qgslayoutpagecollection.h"
#include "qgslayoutundostack.h"

#include <QObject>
#include "qgstest.h"
Expand Down
1 change: 1 addition & 0 deletions tests/src/core/testqgslayoutpage.cpp
View file
Expand Up @@ -25,6 +25,7 @@
#include "qgsfillsymbollayer.h"
#include "qgslinesymbollayer.h"
#include "qgsmultirenderchecker.h"
#include "qgslayoutpagecollection.h"
#include <QObject>
#include "qgstest.h"

Expand Down

0 comments on commit c496b3b

Please sign in to comment.