From 8dfef06aecaa13c99ef0d7873134be1d5cd05e57 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Wed, 22 May 2024 10:31:44 +0300
Subject: [PATCH] QmlDesigner: Remove the optional func param from
 Model::generateNewId()

Not needed anymore after using UniqueName class.

Change-Id: I252659376af7e8aaf5e4642f9b9bfd2c57cc19fb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
---
 src/plugins/qmldesigner/designercore/include/model.h | 3 +--
 src/plugins/qmldesigner/designercore/model/model.cpp | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h
index 5529064284e..bb45456def8 100644
--- a/src/plugins/qmldesigner/designercore/include/model.h
+++ b/src/plugins/qmldesigner/designercore/include/model.h
@@ -255,8 +255,7 @@ public:
     bool hasId(const QString &id) const;
     bool hasImport(const QString &importUrl) const;
 
-    QString generateNewId(const QString &prefixName, const QString &fallbackPrefix = "element",
-                          std::optional<std::function<bool(const QString &)>> isDuplicate = {}) const;
+    QString generateNewId(const QString &prefixName, const QString &fallbackPrefix = "element") const;
 
     void startDrag(QMimeData *mimeData, const QPixmap &icon);
     void endDrag();
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 1100da62d6e..75b9dfd1bb2 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -1863,21 +1863,17 @@ bool Model::hasImport(const QString &importUrl) const
     });
 }
 
-QString Model::generateNewId(const QString &prefixName, const QString &fallbackPrefix,
-                             std::optional<std::function<bool(const QString &)>> isDuplicate) const
+QString Model::generateNewId(const QString &prefixName, const QString &fallbackPrefix) const
 {
     QString newId = prefixName;
 
     if (newId.isEmpty())
         newId = fallbackPrefix;
 
-    if (!isDuplicate.has_value()) // TODO: to be removed separately to not break build
-        isDuplicate = std::bind(&Model::hasId, this, std::placeholders::_1);
-
     return UniqueName::generateId(prefixName, [&] (const QString &id) {
         // Properties of the root node are not allowed for ids, because they are available in the
         // complete context without qualification.
-        return isDuplicate.value()(id) || d->rootNode()->property(id.toUtf8());
+        return hasId(id) || d->rootNode()->property(id.toUtf8());
     });
 }