Removed superfluous Q_DECLARE_METATYPE usages

src/libtiled/properties.h

@@ -195,6 +195,3 @@ TILEDSHARED_EXPORT QString typeName(const QVariant &value);
 TILEDSHARED_EXPORT void initializeMetatypes();
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::FilePath)
-Q_DECLARE_METATYPE(Tiled::ObjectRef)

src/libtiled/tilelayer.h

@@ -664,5 +664,3 @@ inline void TileLayer::setCells(int x, int y, const TileLayer *tileLayer)
 using SharedTileLayer = QSharedPointer<TileLayer>;
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::Cell)

src/libtiled/world.h

@@ -113,6 +113,3 @@ class TILEDSHARED_EXPORT World : public Object
 };
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::WorldPattern)
-Q_DECLARE_METATYPE(Tiled::WorldMapEntry)

src/libtiledquick/mapref.h

@@ -45,5 +45,3 @@ class TILEDQUICK_SHARED_EXPORT MapRef
 };
 
 } // namespace TiledQuick
-
-Q_DECLARE_METATYPE(TiledQuick::MapRef)

src/tiled/abstracttool.h

@@ -324,5 +324,3 @@ inline ToolManager *AbstractTool::toolManager() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::AbstractTool*)

src/tiled/colorbutton.h

@@ -55,5 +55,3 @@ class ColorButton : public QToolButton
 };
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::ColorButton*);

src/tiled/editableasset.h

@@ -104,5 +104,3 @@ inline Document *EditableAsset::document() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableAsset*)

src/tiled/editablelayer.h

@@ -191,5 +191,3 @@ inline EditableLayer *EditableLayer::find(Layer *layer)
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableLayer*)

src/tiled/editablemap.h

@@ -384,5 +384,3 @@ inline MapDocument *EditableMap::mapDocument() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableMap*)

src/tiled/editablemapobject.h

@@ -295,5 +295,3 @@ inline void EditableMapObject::setHeight(qreal height)
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::Font)

src/tiled/editableproject.h

@@ -61,5 +61,3 @@ inline Project *EditableProject::project() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableProject*)

src/tiled/editabletile.h

@@ -166,5 +166,3 @@ inline EditableTile *EditableTile::find(Tile *tile)
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableTile*)

src/tiled/editabletilelayer.h

@@ -115,5 +115,3 @@ inline TileLayer *EditableTileLayer::tileLayer() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableTileLayer*)

src/tiled/editabletileset.h

@@ -331,5 +331,3 @@ inline void EditableTileset::setTileSize(int width, int height)
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableTileset*)

src/tiled/editablewangset.h

@@ -122,5 +122,3 @@ inline EditableWangSet *EditableWangSet::find(WangSet *wangSet)
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableWangSet*)

src/tiled/editableworld.h

@@ -68,5 +68,3 @@ inline World *EditableWorld::world() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::EditableWorld*)

src/tiled/fileedit.h

@@ -88,5 +88,3 @@ inline bool FileEdit::isDirectory() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::FileEdit*)

src/tiled/mapview.h

@@ -159,5 +159,3 @@ inline QPointF MapView::viewCenter() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::MapView*)

src/tiled/regionvaluetype.h

@@ -132,5 +132,3 @@ inline const QRegion &RegionValueType::region() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::RegionValueType)

src/tiled/scriptdialog.h

@@ -114,6 +114,3 @@ class ScriptDialog : public QDialog
 void registerDialog(QJSEngine *jsEngine);
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::ScriptDialog*);
-Q_DECLARE_METATYPE(Tiled::ScriptImageWidget*)

src/tiled/scriptedaction.h

@@ -68,5 +68,3 @@ inline QString ScriptedAction::iconFileName() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::ScriptedAction*)

src/tiled/scriptedtool.h

@@ -94,5 +94,3 @@ inline QString ScriptedTool::iconFileName() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::ScriptedTool*)

src/tiled/scriptfile.cpp

@@ -793,7 +793,4 @@ void registerFile(QJSEngine *jsEngine)
 
 } // namespace Tiled
 
-Q_DECLARE_METATYPE(Tiled::ScriptBinaryFile*)
-Q_DECLARE_METATYPE(Tiled::ScriptTextFile*)
-
 #include "scriptfile.moc"

src/tiled/scriptfileformatwrappers.h

@@ -77,6 +77,3 @@ class ScriptMapFormatWrapper : public ScriptFileFormatWrapper
 };
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::ScriptTilesetFormatWrapper*)
-Q_DECLARE_METATYPE(Tiled::ScriptMapFormatWrapper*)

src/tiled/scriptimage.h

@@ -161,5 +161,3 @@ class ScriptImage : public QObject
 };
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::ScriptImage*)

src/tiled/tilecollisiondock.h

@@ -169,5 +169,3 @@ inline bool TileCollisionDock::hasSelectedObjects() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::TileCollisionDock*)

src/tiled/tilelayeredit.h

@@ -79,5 +79,3 @@ inline EditableTileLayer *TileLayerEdit::target() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::TileLayerEdit*)

src/tiled/tilelayerwangedit.h

@@ -148,5 +148,3 @@ inline void TileLayerWangEdit::setEdge(int x, int y, WangIndex::Value edge, int
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::TileLayerWangEdit*)

src/tiled/tileseteditor.h

@@ -209,5 +209,3 @@ inline TileCollisionDock *TilesetEditor::collisionEditor() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::TilesetEditor*)

src/tiled/tilesetview.h

@@ -173,5 +173,3 @@ inline bool TilesetView::markAnimatedTiles() const
 }
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::TilesetView *)

src/tiled/wangsetview.h

@@ -58,5 +58,3 @@ class WangSetView : public QTreeView
 };
 
 } // namespace Tiled
-
-Q_DECLARE_METATYPE(Tiled::WangSetView *)