Dedupe apply function between tilelayeredit and tilelayerwangedit

src/tiled/editabletilelayer.cpp

@@ -20,9 +20,11 @@
 
 #include "editabletilelayer.h"
 
+#include "addremovetileset.h"
 #include "changelayer.h"
 #include "editablemanager.h"
 #include "editablemap.h"
+#include "painttilelayer.h"
 #include "resizetilelayer.h"
 #include "tilelayeredit.h"
 #include "tilelayerwangedit.h"
@@ -109,6 +111,46 @@ TileLayerWangEdit *EditableTileLayer::wangEdit(EditableWangSet *wangSet)
     return new TileLayerWangEdit(this, wangSet);
 }
 
+void EditableTileLayer::applyChangesFrom(TileLayer *changes, bool mergeable) 
+{
+    // Determine painted region and normalize the changes layer
+    auto paintedRegion = changes->region([] (const Cell &cell) { return cell.checked(); });
+
+    // If the painted region is empty there's nothing else to do
+    if (paintedRegion.isEmpty())
+        return;
+
+    auto rect = paintedRegion.boundingRect();
+    changes->resize(rect.size(), -rect.topLeft());
+    const auto tilesets = changes->usedTilesets();
+
+    if (mapDocument()) {
+        // Apply the change using an undo command
+        auto mapDocument = map()->mapDocument();
+        auto paint = new PaintTileLayer(mapDocument,
+                                        tileLayer(),
+                                        rect.x(), rect.y(),
+                                        changes,
+                                        paintedRegion);
+        paint->setMergeable(mergeable);
+
+        // Add any used tilesets that aren't yet part of the target map
+        const auto existingTilesets = mapDocument->map()->tilesets();
+        for (const SharedTileset &tileset : tilesets)
+            if (!existingTilesets.contains(tileset))
+                new AddTileset(mapDocument, tileset, paint);
+
+        map()->push(paint);
+    } else {
+        // Add any used tilesets that aren't yet part of the target map
+        if (auto map = tileLayer()->map())
+            map->addTilesets(tilesets);
+
+        // Apply the change directly
+        tileLayer()->setCells(rect.x(), rect.y(), changes, paintedRegion);
+    }
+}
+
 } // namespace Tiled
 
 #include "moc_editabletilelayer.cpp"

src/tiled/editabletilelayer.h

@@ -76,6 +76,8 @@ class EditableTileLayer : public EditableLayer
 
     QList<TileLayerEdit*> mActiveEdits;
     QList<TileLayerWangEdit*> mActiveWangEdits;
+
+    void applyChangesFrom(TileLayer *changes, bool mergeable);
 };
 
 

src/tiled/tilelayeredit.cpp

@@ -63,44 +63,7 @@ void TileLayerEdit::apply()
     // Applying an edit automatically makes it mergeable, so that further
     // changes made through the same edit are merged by default.
     bool mergeable = std::exchange(mMergeable, true);
-
-    // Determine painted region and normalize the changes layer
-    auto paintedRegion = mChanges.region([] (const Cell &cell) { return cell.checked(); });
-
-    // If the painted region is empty there's nothing else to do
-    if (paintedRegion.isEmpty())
-        return;
-
-    auto rect = paintedRegion.boundingRect();
-    mChanges.resize(rect.size(), -rect.topLeft());
-    const auto tilesets = mChanges.usedTilesets();
-
-    if (mTargetLayer->mapDocument()) {
-        // Apply the change using an undo command
-        auto mapDocument = mTargetLayer->map()->mapDocument();
-        auto paint = new PaintTileLayer(mapDocument,
-                                        mTargetLayer->tileLayer(),
-                                        rect.x(), rect.y(),
-                                        &mChanges,
-                                        paintedRegion);
-        paint->setMergeable(mergeable);
-
-        // Add any used tilesets that aren't yet part of the target map
-        const auto existingTilesets = mapDocument->map()->tilesets();
-        for (const SharedTileset &tileset : tilesets)
-            if (!existingTilesets.contains(tileset))
-                new AddTileset(mapDocument, tileset, paint);
-
-        mTargetLayer->map()->push(paint);
-    } else {
-        // Add any used tilesets that aren't yet part of the target map
-        if (auto map = mTargetLayer->tileLayer()->map())
-            map->addTilesets(tilesets);
-
-        // Apply the change directly
-        mTargetLayer->tileLayer()->setCells(rect.x(), rect.y(), &mChanges, paintedRegion);
-    }
-
+    mTargetLayer->applyChangesFrom(&mChanges, mergeable);
     mChanges.clear();
 }
 

src/tiled/tilelayerwangedit.cpp

@@ -27,7 +27,6 @@ void TileLayerWangEdit::setTerrain(int x, int y, int color, WangId::Index direct
     mWangPainter->setTerrain(mTargetLayer->mapDocument(), color, QPoint(x, y), direction);
 }
 
-// currently copied from tilelayeredit.cpp
 void TileLayerWangEdit::apply()
 {
 	// apply terrain changes
@@ -36,44 +35,7 @@ void TileLayerWangEdit::apply()
     // Applying an edit automatically makes it mergeable, so that further
     // changes made through the same edit are merged by default.
     bool mergeable = std::exchange(mMergeable, true);
-
-    // Determine painted region and normalize the changes layer
-    auto paintedRegion = mChanges.region([] (const Cell &cell) { return cell.checked(); });
-
-    // If the painted region is empty there's nothing else to do
-    if (paintedRegion.isEmpty())
-        return;
-
-    auto rect = paintedRegion.boundingRect();
-    mChanges.resize(rect.size(), -rect.topLeft());
-    const auto tilesets = mChanges.usedTilesets();
-
-    if (mTargetLayer->mapDocument()) {
-        // Apply the change using an undo command
-        auto mapDocument = mTargetLayer->map()->mapDocument();
-        auto paint = new PaintTileLayer(mapDocument,
-                                        mTargetLayer->tileLayer(),
-                                        rect.x(), rect.y(),
-                                        &mChanges,
-                                        paintedRegion);
-        paint->setMergeable(mergeable);
-
-        // Add any used tilesets that aren't yet part of the target map
-        const auto existingTilesets = mapDocument->map()->tilesets();
-        for (const SharedTileset &tileset : tilesets)
-            if (!existingTilesets.contains(tileset))
-                new AddTileset(mapDocument, tileset, paint);
-
-        mTargetLayer->map()->push(paint);
-    } else {
-        // Add any used tilesets that aren't yet part of the target map
-        if (auto map = mTargetLayer->tileLayer()->map())
-            map->addTilesets(tilesets);
-
-        // Apply the change directly
-        mTargetLayer->tileLayer()->setCells(rect.x(), rect.y(), &mChanges, paintedRegion);
-    }
-
+	mTargetLayer->applyChangesFrom(&mChanges, mergeable);
     mChanges.clear();
 }
 

src/tiled/tilelayerwangedit.h

@@ -1,23 +1,3 @@
-/*
- * tilelayeredit.h
- * Copyright 2019, Thorbjørn Lindeijer <[email protected]>
- *
- * This file is part of Tiled.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 #pragma once
 
 #include "editablewangset.h"