Qt 6: Types now need to be fully defined for use by meta-object system

It appears types used in properties, signals, Q_INVOKABLE functions, etc. now need to be fully defined even when only referenced by pointer. This created many circular dependency issues, which is why I've opted to change many of such occurrences to QObject* and adding qobject_cast or static_cast where necessary.
csueiras · Oct 13, 2020 · 1d6df01 · 1d6df01
1 parent 272936f
commit 1d6df01
Show file tree

Hide file tree

Showing 27 changed files with 114 additions and 81 deletions.
diff --git a/src/tiled/editablelayer.cpp b/src/tiled/editablelayer.cpp
@@ -44,6 +44,11 @@ EditableLayer::~EditableLayer()
     EditableManager::instance().mEditableLayers.remove(layer());
 }
 
+QObject *EditableLayer::mapAsObject() const
+{
+    return map();
+}
+
 EditableMap *EditableLayer::map() const
 {
     return asset()->isMap() ? static_cast<EditableMap*>(asset()) : nullptr;

diff --git a/src/tiled/editablelayer.h b/src/tiled/editablelayer.h
@@ -39,7 +39,7 @@ class EditableLayer : public EditableObject
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible)
     Q_PROPERTY(bool locked READ isLocked WRITE setLocked)
     Q_PROPERTY(QPointF offset READ offset WRITE setOffset)
-    Q_PROPERTY(Tiled::EditableMap *map READ map)
+    Q_PROPERTY(QObject *map READ mapAsObject)
     Q_PROPERTY(bool selected READ isSelected WRITE setSelected)
     Q_PROPERTY(bool isTileLayer READ isTileLayer CONSTANT)
     Q_PROPERTY(bool isObjectLayer READ isObjectLayer CONSTANT)
@@ -60,6 +60,7 @@ class EditableLayer : public EditableObject
     bool isVisible() const;
     bool isLocked() const;
     QPointF offset() const;
+    QObject *mapAsObject() const;
     EditableMap *map() const;
     bool isSelected() const;
     bool isTileLayer() const;

diff --git a/src/tiled/editablemap.h b/src/tiled/editablemap.h
@@ -21,6 +21,8 @@
 #pragma once
 
 #include "editableasset.h"
+#include "editablelayer.h"
+#include "editableselectedarea.h"
 #include "mapdocument.h"
 #include "regionvaluetype.h"
 
@@ -29,9 +31,7 @@ namespace Tiled {
 class MapObject;
 
 class AutomappingManager;
-class EditableLayer;
 class EditableMapObject;
-class EditableSelectedArea;
 class EditableTileset;
 
 class EditableMap : public EditableAsset

diff --git a/src/tiled/editablemapobject.cpp b/src/tiled/editablemapobject.cpp
@@ -80,7 +80,7 @@ QJSValue EditableMapObject::polygon() const
     return array;
 }
 
-EditableTile *EditableMapObject::tile() const
+QObject *EditableMapObject::tile() const
 {
     Tile *tile = mapObject()->cell().tile();
     if (!tile)
@@ -104,11 +104,16 @@ bool EditableMapObject::isSelected() const
     return false;
 }
 
-EditableObjectGroup *EditableMapObject::layer() const
+QObject *EditableMapObject::layer() const
 {
     return EditableManager::instance().editableObjectGroup(asset(), mapObject()->objectGroup());
 }
 
+QObject *EditableMapObject::mapAsObject() const
+{
+    return map();
+}
+
 EditableMap *EditableMapObject::map() const
 {
     return asset()->isMap() ? static_cast<EditableMap*>(asset()) : nullptr;
@@ -249,8 +254,10 @@ void EditableMapObject::setTextColor(const QColor &textColor)
     setMapObjectProperty(MapObject::TextColorProperty, textColor);
 }
 
-void EditableMapObject::setTile(EditableTile *tile)
+void EditableMapObject::setTile(QObject *tileAsObject)
 {
+    EditableTile *tile = qobject_cast<EditableTile*>(tileAsObject);
+
     if (Document *doc = document()) {
         QList<MapObject *> mapObjects { mapObject() };
         asset()->push(new ChangeMapObjectsTile(doc,

diff --git a/src/tiled/editablemapobject.h b/src/tiled/editablemapobject.h
@@ -70,13 +70,13 @@ class EditableMapObject : public EditableObject
     Q_PROPERTY(Qt::Alignment textAlignment READ textAlignment WRITE setTextAlignment)
     Q_PROPERTY(bool wordWrap READ wordWrap WRITE setWordWrap)
     Q_PROPERTY(QColor textColor READ textColor WRITE setTextColor)
-    Q_PROPERTY(Tiled::EditableTile *tile READ tile WRITE setTile)
+    Q_PROPERTY(QObject *tile READ tile WRITE setTile)
     Q_PROPERTY(bool tileFlippedHorizontally READ tileFlippedHorizontally WRITE setTileFlippedHorizontally)
     Q_PROPERTY(bool tileFlippedVertically READ tileFlippedVertically WRITE setTileFlippedVertically)
 //    Q_PROPERTY(const ObjectTemplate *mObjectTemplate)
     Q_PROPERTY(bool selected READ isSelected WRITE setSelected)
-    Q_PROPERTY(Tiled::EditableObjectGroup *layer READ layer)
-    Q_PROPERTY(Tiled::EditableMap *map READ map)
+    Q_PROPERTY(QObject *layer READ layer)
+    Q_PROPERTY(QObject *map READ mapAsObject)
 //    Q_PROPERTY(ChangedProperties mChangedProperties)
 
 public:
@@ -122,11 +122,12 @@ class EditableMapObject : public EditableObject
     Qt::Alignment textAlignment() const;
     bool wordWrap() const;
     QColor textColor() const;
-    EditableTile *tile() const;
+    QObject *tile() const;
     bool tileFlippedHorizontally() const;
     bool tileFlippedVertically() const;
     bool isSelected() const;
-    EditableObjectGroup *layer() const;
+    QObject *layer() const;
+    QObject *mapAsObject() const;
     EditableMap *map() const;
 
     MapObject *mapObject() const;
@@ -154,7 +155,7 @@ public slots:
     void setTextAlignment(Qt::Alignment textAlignment);
     void setWordWrap(bool wordWrap);
     void setTextColor(const QColor &textColor);
-    void setTile(EditableTile *tile);
+    void setTile(QObject *tile);
     void setTileFlippedHorizontally(bool tileFlippedHorizontally);
     void setTileFlippedVertically(bool tileFlippedVertically);
     void setSelected(bool selected);

diff --git a/src/tiled/editableobject.cpp b/src/tiled/editableobject.cpp
@@ -42,6 +42,11 @@ EditableObject::EditableObject(EditableAsset *asset,
 {
 }
 
+QObject *EditableObject::assetAsObject() const
+{
+    return asset();
+}
+
 bool EditableObject::isReadOnly() const
 {
     return asset() && asset()->isReadOnly();

diff --git a/src/tiled/editableobject.h b/src/tiled/editableobject.h
@@ -41,14 +41,15 @@ class EditableObject : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(Tiled::EditableAsset *asset READ asset)
+    Q_PROPERTY(QObject *asset READ assetAsObject)
     Q_PROPERTY(bool readOnly READ isReadOnly)
 
 public:
     EditableObject(EditableAsset *asset,
                    Object *object,
                    QObject *parent = nullptr);
 
+    QObject *assetAsObject() const;
     EditableAsset *asset() const;
     virtual bool isReadOnly() const;
 

diff --git a/src/tiled/editabletile.cpp b/src/tiled/editabletile.cpp
@@ -47,7 +47,7 @@ EditableTile::~EditableTile()
     EditableManager::instance().mEditableTiles.remove(tile());
 }
 
-EditableObjectGroup *EditableTile::objectGroup() const
+QObject *EditableTile::objectGroup() const
 {
     if (!mAttachedObjectGroup) {
         mAttachedObjectGroup = tile()->objectGroup();
@@ -152,8 +152,10 @@ void EditableTile::setProbability(qreal probability)
         tile()->setProbability(probability);
 }
 
-void EditableTile::setObjectGroup(EditableObjectGroup *editableObjectGroup)
+void EditableTile::setObjectGroup(QObject *object)
 {
+    EditableObjectGroup *editableObjectGroup = qobject_cast<EditableObjectGroup*>(object);
+
     if (!editableObjectGroup) {
         ScriptManager::instance().throwNullArgError(0);
         return;

diff --git a/src/tiled/editabletile.h b/src/tiled/editabletile.h
@@ -42,10 +42,10 @@ class EditableTile : public EditableObject
     Q_PROPERTY(QString type READ type WRITE setType)
     Q_PROPERTY(QString imageFileName READ imageFileName WRITE setImageFileName)
     Q_PROPERTY(qreal probability READ probability WRITE setProbability)
-    Q_PROPERTY(Tiled::EditableObjectGroup *objectGroup READ objectGroup WRITE setObjectGroup)
+    Q_PROPERTY(QObject *objectGroup READ objectGroup WRITE setObjectGroup)
     Q_PROPERTY(QJSValue frames READ frames WRITE setFrames)
     Q_PROPERTY(bool animated READ isAnimated)
-    Q_PROPERTY(Tiled::EditableTileset *tileset READ tileset)
+    Q_PROPERTY(QObject *tileset READ assetAsObject)
 
 public:
     enum Flags {
@@ -76,7 +76,7 @@ class EditableTile : public EditableObject
     const QString &type() const;
     QString imageFileName() const;
     qreal probability() const;
-    EditableObjectGroup *objectGroup() const;
+    QObject *objectGroup() const;
     QJSValue frames() const;
     bool isAnimated() const;
     EditableTileset *tileset() const;
@@ -93,7 +93,7 @@ public slots:
     void setType(const QString &type);
     void setImageFileName(const QString &fileName);
     void setProbability(qreal probability);
-    void setObjectGroup(EditableObjectGroup *editableObjectGroup);
+    void setObjectGroup(QObject *editableObjectGroup);
     void setFrames(QJSValue value);
 
 private:

diff --git a/src/tiled/editablewangset.h b/src/tiled/editablewangset.h
@@ -20,15 +20,13 @@
 
 #pragma once
 
-#include "editableobject.h"
+#include "editabletile.h"
 #include "wangset.h"
 
 #include <QJSValue>
 
 namespace Tiled {
 
-class EditableTile;
-class EditableTileset;
 class TilesetDocument;
 
 class EditableWangSet : public EditableObject
@@ -39,7 +37,7 @@ class EditableWangSet : public EditableObject
     Q_PROPERTY(Type type READ type WRITE setType)
     Q_PROPERTY(Tiled::EditableTile *imageTile READ imageTile WRITE setImageTile)
     Q_PROPERTY(int colorCount READ colorCount WRITE setColorCount)
-    Q_PROPERTY(Tiled::EditableTileset *tileset READ tileset)
+    Q_PROPERTY(QObject *tileset READ assetAsObject)
 
 public:
     enum Type {

diff --git a/src/tiled/mapdocument.h b/src/tiled/mapdocument.h
@@ -26,6 +26,7 @@
 #include "layer.h"
 #include "map.h"
 #include "mapformat.h"
+#include "mapobject.h"
 #include "tiled.h"
 #include "tileset.h"
 
@@ -43,12 +44,9 @@ class QUndoStack;
 
 namespace Tiled {
 
-class Map;
-class MapObject;
 class MapRenderer;
 class ObjectTemplate;
 class Terrain;
-class Tile;
 class WangSet;
 
 class LayerModel;

diff --git a/src/tiled/mapeditor.cpp b/src/tiled/mapeditor.cpp
@@ -310,6 +310,11 @@ MapEditor::~MapEditor()
 {
 }
 
+QObject *MapEditor::tilesetDock() const
+{
+    return mTilesetDock;
+}
+
 void MapEditor::saveState()
 {
     preferences::mapEditorSize = mMainWindow->size();
@@ -581,6 +586,11 @@ void MapEditor::resetLayout()
     mTileStampsDock->setVisible(false);
 }
 
+QObject *MapEditor::currentMapViewAsObject() const
+{
+    return currentMapView();
+}
+
 Zoomable *MapEditor::zoomable() const
 {
     if (auto view = currentMapView())
@@ -1011,7 +1021,7 @@ SharedTileset MapEditor::currentTileset() const
     return mTilesetDock->currentTileset();
 }
 
-EditableMap *MapEditor::currentBrush() const
+QObject *MapEditor::currentBrush() const
 {
     const TileStamp &stamp = mStampBrush->stamp();
     if (stamp.isEmpty())
@@ -1023,8 +1033,10 @@ EditableMap *MapEditor::currentBrush() const
     return editableMap;
 }
 
-void MapEditor::setCurrentBrush(EditableMap *editableMap)
+void MapEditor::setCurrentBrush(QObject *object)
 {
+    EditableMap *editableMap = qobject_cast<EditableMap*>(object);
+
     if (!editableMap) {
         ScriptManager::instance().throwNullArgError(0);
         return;

diff --git a/src/tiled/mapeditor.h b/src/tiled/mapeditor.h
@@ -71,15 +71,15 @@ class MapEditor : public Editor
 {
     Q_OBJECT
 
-    Q_PROPERTY(Tiled::TilesetDock *tilesetsView READ tilesetDock)
-    Q_PROPERTY(Tiled::EditableMap *currentBrush READ currentBrush WRITE setCurrentBrush)
-    Q_PROPERTY(Tiled::MapView *currentMapView READ currentMapView)
+    Q_PROPERTY(QObject *tilesetsView READ tilesetDock)
+    Q_PROPERTY(QObject *currentBrush READ currentBrush WRITE setCurrentBrush)
+    Q_PROPERTY(QObject *currentMapView READ currentMapViewAsObject)
 
 public:
     explicit MapEditor(QObject *parent = nullptr);
     ~MapEditor() override;
 
-    TilesetDock *tilesetDock() const { return mTilesetDock; }
+    QObject *tilesetDock() const;
     TemplatesDock *templatesDock() const { return mTemplatesDock; }
 
     void saveState() override;
@@ -105,6 +105,7 @@ class MapEditor : public Editor
 
     MapView *viewForDocument(MapDocument *mapDocument) const;
     MapView *currentMapView() const;
+    QObject *currentMapViewAsObject() const;
     Zoomable *zoomable() const override;
 
     void saveDocumentState(MapDocument *mapDocument) const;
@@ -113,8 +114,8 @@ class MapEditor : public Editor
     void setCurrentTileset(const SharedTileset &tileset);
     SharedTileset currentTileset() const;
 
-    EditableMap *currentBrush() const;
-    void setCurrentBrush(EditableMap *editableMap);
+    QObject *currentBrush() const;
+    void setCurrentBrush(QObject *editableMap);
 
     void addExternalTilesets(const QStringList &fileNames);
 

diff --git a/src/tiled/scriptedtool.cpp b/src/tiled/scriptedtool.cpp
@@ -22,6 +22,7 @@
 
 #include "brushitem.h"
 #include "editablemap.h"
+#include "editabletile.h"
 #include "mapdocument.h"
 #include "pluginmanager.h"
 #include "scriptmanager.h"
@@ -60,13 +61,13 @@ ScriptedTool::~ScriptedTool()
     PluginManager::removeObject(this);
 }
 
-EditableMap *ScriptedTool::editableMap() const
+QObject *ScriptedTool::editableMap() const
 {
     return mapDocument() ? static_cast<EditableMap*>(mapDocument()->editable())
                          : nullptr;
 }
 
-EditableTile *ScriptedTool::editableTile() const
+QObject *ScriptedTool::editableTile() const
 {
     if (Tile *t = tile()) {
         auto tileset = t->tileset()->sharedPointer();
@@ -80,7 +81,7 @@ EditableTile *ScriptedTool::editableTile() const
     return nullptr;
 }
 
-EditableMap *ScriptedTool::preview() const
+QObject *ScriptedTool::preview() const
 {
     const auto &map = brushItem()->map();
     if (!map)
@@ -91,8 +92,9 @@ EditableMap *ScriptedTool::preview() const
     return editableMap;
 }
 
-void ScriptedTool::setPreview(EditableMap *editableMap)
+void ScriptedTool::setPreview(QObject *object)
 {
+    EditableMap *editableMap = qobject_cast<EditableMap*>(object);
     if (!editableMap) {
         ScriptManager::instance().throwNullArgError(0);
         return;