Move sortAndFilterAnyMergableNodesSafe into KisLayerUtils

dimula73 · dimula73 · commit 20a85537032b · 2019-09-09T17:50:05.000+03:00
All node sorting algorithms should be in one place
diff --git a/libs/image/kis_layer_utils.cpp b/libs/image/kis_layer_utils.cpp
@@ -1178,6 +1178,30 @@ namespace KisLayerUtils {
         return result;
     }
 
+    KisNodeList sortAndFilterAnyMergableNodesSafe(const KisNodeList &nodes, KisImageSP image) {
+        KisNodeList filteredNodes = nodes;
+        KisNodeList sortedNodes;
+
+        KisLayerUtils::filterMergableNodes(filteredNodes, true);
+
+        bool haveExternalNodes = false;
+        Q_FOREACH (KisNodeSP node, nodes) {
+            if (node->graphListener() != image->root()->graphListener()) {
+                haveExternalNodes = true;
+                break;
+            }
+        }
+
+        if (!haveExternalNodes) {
+            KisLayerUtils::sortMergableNodes(image->root(), filteredNodes, sortedNodes);
+        } else {
+            sortedNodes = filteredNodes;
+        }
+
+        return sortedNodes;
+    }
+
+
     void addCopyOfNameTag(KisNodeSP node)
     {
         const QString prefix = i18n("Copy of");
diff --git a/libs/image/kis_layer_utils.h b/libs/image/kis_layer_utils.h
@@ -40,6 +40,7 @@ namespace KisLayerUtils
     KRITAIMAGE_EXPORT void sortMergableNodes(KisNodeSP root, QList<KisNodeSP> &inputNodes, QList<KisNodeSP> &outputNodes);
     KRITAIMAGE_EXPORT KisNodeList sortMergableNodes(KisNodeSP root, KisNodeList nodes);
     KRITAIMAGE_EXPORT void filterMergableNodes(KisNodeList &nodes, bool allowMasks = false);
+    KRITAIMAGE_EXPORT KisNodeList sortAndFilterAnyMergableNodesSafe(const KisNodeList &nodes, KisImageSP image);
     KRITAIMAGE_EXPORT bool checkIsChildOf(KisNodeSP node, const KisNodeList &parents);
     KRITAIMAGE_EXPORT void filterUnlockedNodes(KisNodeList &nodes);
 
diff --git a/libs/ui/kis_node_juggler_compressed.cpp b/libs/ui/kis_node_juggler_compressed.cpp
@@ -310,28 +310,6 @@ class ActivateSelectionMasksCommand : public KisCommandUtils::FlipFlopCommand
     QList<KisSelectionMaskSP> m_activeAfter;
 };
 
-KisNodeList sortAndFilterNodes(const KisNodeList &nodes, KisImageSP image) {
-    KisNodeList filteredNodes = nodes;
-    KisNodeList sortedNodes;
-
-    KisLayerUtils::filterMergableNodes(filteredNodes, true);
-
-    bool haveExternalNodes = false;
-    Q_FOREACH (KisNodeSP node, nodes) {
-        if (node->graphListener() != image->root()->graphListener()) {
-            haveExternalNodes = true;
-            break;
-        }
-    }
-
-    if (!haveExternalNodes) {
-        KisLayerUtils::sortMergableNodes(image->root(), filteredNodes, sortedNodes);
-    } else {
-        sortedNodes = filteredNodes;
-    }
-
-    return sortedNodes;
-}
 
 /**
  * A generalized command to muve up/down a set of layer
@@ -369,7 +347,7 @@ struct LowerRaiseLayer : public KisCommandUtils::AggregateCommand {
     }
 
     void populateChildCommands() override {
-        KisNodeList sortedNodes = sortAndFilterNodes(m_nodes, m_image);
+        KisNodeList sortedNodes = KisLayerUtils::sortAndFilterAnyMergableNodesSafe(m_nodes, m_image);
         KisNodeSP headNode = m_lower ? sortedNodes.first() : sortedNodes.last();
         const NodesType nodesType = getNodesType(sortedNodes);
 
@@ -493,7 +471,7 @@ struct DuplicateLayers : public KisCommandUtils::AggregateCommand {
           m_mode(mode) {}
 
     void populateChildCommands() override {
-        KisNodeList filteredNodes = sortAndFilterNodes(m_nodes, m_image);
+        KisNodeList filteredNodes = KisLayerUtils::sortAndFilterAnyMergableNodesSafe(m_nodes, m_image);
 
         if (filteredNodes.isEmpty()) return;
 
