feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove the optional func param from Model::generateNewId()

Browse Source 
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>
This commit is contained in:
Mahmoud Badri
2024-05-22 10:31:44 +03:00
parent 93861d6d56
commit 8dfef06aec
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/designercore/include/model.h
View File

@@ -255,8 +255,7 @@ public:
bool hasId(const QString &id) const; bool hasId(const QString &id) const;
bool hasImport(const QString &importUrl) const; bool hasImport(const QString &importUrl) const;
QString generateNewId(const QString &prefixName, const QString &fallbackPrefix = "element", QString generateNewId(const QString &prefixName, const QString &fallbackPrefix = "element") const;
std::optional<std::function<bool(const QString &)>> isDuplicate = {}) const;
void startDrag(QMimeData *mimeData, const QPixmap &icon); void startDrag(QMimeData *mimeData, const QPixmap &icon);
void endDrag(); void endDrag();

8
src/plugins/qmldesigner/designercore/model/model.cpp
View File

@@ -1863,21 +1863,17 @@ bool Model::hasImport(const QString &importUrl) const
}); });
} }
QString Model::generateNewId(const QString &prefixName, const QString &fallbackPrefix, QString Model::generateNewId(const QString &prefixName, const QString &fallbackPrefix) const
std::optional<std::function<bool(const QString &)>> isDuplicate) const
{ {
QString newId = prefixName; QString newId = prefixName;
if (newId.isEmpty()) if (newId.isEmpty())
newId = fallbackPrefix; 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) { return UniqueName::generateId(prefixName, [&] (const QString &id) {
// Properties of the root node are not allowed for ids, because they are available in the // Properties of the root node are not allowed for ids, because they are available in the
// complete context without qualification. // complete context without qualification.
return isDuplicate.value()(id) || d->rootNode()->property(id.toUtf8()); return hasId(id) || d->rootNode()->property(id.toUtf8());
}); });
} }