forked from teamnwah/openmw-tes3coop
Use a forward declaration to avoid having to workaround Qt MOC
Don't think that guard was still needed, but a forward declaration is better anyways.
This commit is contained in:
parent
80a0398f9d
commit
5fb854036d
4 changed files with 19 additions and 11 deletions
|
@ -9,6 +9,7 @@
|
|||
#include <components/esm/loadcell.hpp>
|
||||
#include <components/esm/loadland.hpp>
|
||||
#include <components/sceneutil/pathgridutil.hpp>
|
||||
#include <components/terrain/terraingrid.hpp>
|
||||
|
||||
#include "../../model/world/idtable.hpp"
|
||||
#include "../../model/world/columns.hpp"
|
||||
|
@ -17,9 +18,13 @@
|
|||
#include "../../model/world/cellcoordinates.hpp"
|
||||
|
||||
#include "cellwater.hpp"
|
||||
#include "cellborder.hpp"
|
||||
#include "cellarrow.hpp"
|
||||
#include "cellmarker.hpp"
|
||||
#include "mask.hpp"
|
||||
#include "pathgrid.hpp"
|
||||
#include "terrainstorage.hpp"
|
||||
#include "object.hpp"
|
||||
|
||||
bool CSVRender::Cell::removeObject (const std::string& id)
|
||||
{
|
||||
|
|
|
@ -6,18 +6,9 @@
|
|||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
#include <osg/ref_ptr>
|
||||
|
||||
#ifndef Q_MOC_RUN
|
||||
#include <components/terrain/terraingrid.hpp>
|
||||
#endif
|
||||
|
||||
#include "object.hpp"
|
||||
#include "cellarrow.hpp"
|
||||
#include "cellmarker.hpp"
|
||||
#include "cellborder.hpp"
|
||||
#include "../../model/world/cellcoordinates.hpp"
|
||||
|
||||
class QModelIndex;
|
||||
|
||||
|
@ -31,7 +22,11 @@ namespace osg
|
|||
namespace CSMWorld
|
||||
{
|
||||
class Data;
|
||||
class CellCoordinates;
|
||||
}
|
||||
|
||||
namespace Terrain
|
||||
{
|
||||
class TerrainGrid;
|
||||
}
|
||||
|
||||
namespace CSVRender
|
||||
|
@ -39,6 +34,12 @@ namespace CSVRender
|
|||
class CellWater;
|
||||
class Pathgrid;
|
||||
class TagBase;
|
||||
class Object;
|
||||
|
||||
class CellArrow;
|
||||
class CellBorder;
|
||||
class CellMarker;
|
||||
class CellWater;
|
||||
|
||||
class Cell
|
||||
{
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "editmode.hpp"
|
||||
#include "mask.hpp"
|
||||
#include "cameracontroller.hpp"
|
||||
#include "cellarrow.hpp"
|
||||
|
||||
bool CSVRender::PagedWorldspaceWidget::adjustCells()
|
||||
{
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include "../widget/scenetooltoggle2.hpp"
|
||||
|
||||
#include "mask.hpp"
|
||||
#include "tagbase.hpp"
|
||||
|
||||
void CSVRender::UnpagedWorldspaceWidget::update()
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue