diff options
| author | hjk <hjk@qt.io> | 2023-05-09 18:22:42 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2023-05-10 04:59:13 +0000 |
| commit | 2e7930b56e1e32343587e0c7c74cdb641050ea30 (patch) | |
| tree | 09178b5f83876c2621b4c8c05504f8780304440b | |
| parent | c2f9f4265344737fa485b5800543c484e9f54b1e (diff) | |
| download | qt-creator-2e7930b56e1e32343587e0c7c74cdb641050ea30.tar.gz | |
LayoutBuilder: Rename Id to ID
The Id was only used in the demo. "ID" is Not exactly canonical naming,
but this clashes often with Utils::Id, so mis-spell until we settle on a
proper name.
Change-Id: I6fdf806c41abf224f7422ec6c9263db3eb357190
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | src/libs/utils/layoutbuilder.cpp | 4 | ||||
| -rw-r--r-- | src/libs/utils/layoutbuilder.h | 8 | ||||
| -rw-r--r-- | tests/manual/layoutbuilder/demo/main.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/layoutbuilder.cpp b/src/libs/utils/layoutbuilder.cpp index 40862c0434..f23b5e025f 100644 --- a/src/libs/utils/layoutbuilder.cpp +++ b/src/libs/utils/layoutbuilder.cpp @@ -710,12 +710,12 @@ LayoutItem columnStretch(int column, int stretch) // Id based setters -LayoutItem id(Id &out) +LayoutItem id(ID &out) { return [&out](QObject *target) { out.ob = target; }; } -void setText(Id id, const QString &text) +void setText(ID id, const QString &text) { if (auto textEdit = qobject_cast<QTextEdit *>(id.ob)) textEdit->setText(text); diff --git a/src/libs/utils/layoutbuilder.h b/src/libs/utils/layoutbuilder.h index 3898dd5982..33fba0270d 100644 --- a/src/libs/utils/layoutbuilder.h +++ b/src/libs/utils/layoutbuilder.h @@ -202,15 +202,15 @@ QTCREATOR_UTILS_EXPORT LayoutItem windowTitle(const QString &windowTitle); // "Getters" -class Id +class ID { public: QObject *ob = nullptr; }; -QTCREATOR_UTILS_EXPORT LayoutItem id(Id &out); +QTCREATOR_UTILS_EXPORT LayoutItem id(ID &out); -QTCREATOR_UTILS_EXPORT void setText(Id id, const QString &text); +QTCREATOR_UTILS_EXPORT void setText(ID id, const QString &text); // "Signals" @@ -222,7 +222,7 @@ QTCREATOR_UTILS_EXPORT LayoutItem onTextChanged(const std::function<void(const Q QTCREATOR_UTILS_EXPORT LayoutItem onValueChanged(const std::function<void(int)> &, QObject *guard = nullptr); -QTCREATOR_UTILS_EXPORT LayoutItem onTextChanged(Id &id, QVariant(*sig)(QObject *)); +QTCREATOR_UTILS_EXPORT LayoutItem onTextChanged(ID &id, QVariant(*sig)(QObject *)); // Convenience diff --git a/tests/manual/layoutbuilder/demo/main.cpp b/tests/manual/layoutbuilder/demo/main.cpp index 60996ba96e..2dd95dfddb 100644 --- a/tests/manual/layoutbuilder/demo/main.cpp +++ b/tests/manual/layoutbuilder/demo/main.cpp @@ -9,7 +9,7 @@ using namespace Layouting; int main(int argc, char *argv[]) { - Id textId; + ID textId; Application app { |