diff --git a/src/qtcommon/View_qt.cpp b/src/qtcommon/View_qt.cpp index 358c5d93..f6fd38b1 100644 --- a/src/qtcommon/View_qt.cpp +++ b/src/qtcommon/View_qt.cpp @@ -53,6 +53,12 @@ QObject *View_qt::thisObject() const return m_thisObj; } +void View_qt::setObjectName(const QString &name) +{ + if (m_thisObj) + m_thisObj->setObjectName(name); +} + /*static*/ QObject *View_qt::asObject(View *view) { diff --git a/src/qtcommon/View_qt.h b/src/qtcommon/View_qt.h index be1c9fe0..90ce3b48 100644 --- a/src/qtcommon/View_qt.h +++ b/src/qtcommon/View_qt.h @@ -33,6 +33,8 @@ public: QObject *thisObject() const; + void setObjectName(const QString &name) override; + /// TODOm3: Rename to asQObject once View::asQObject is gone static QObject *asObject(View *); diff --git a/src/qtquick/views/ViewWrapper_qtquick.cpp b/src/qtquick/views/ViewWrapper_qtquick.cpp index 1f0c13d7..497feb53 100644 --- a/src/qtquick/views/ViewWrapper_qtquick.cpp +++ b/src/qtquick/views/ViewWrapper_qtquick.cpp @@ -115,11 +115,6 @@ ViewWrapper_qtquick::ViewWrapper_qtquick(QQuickItem *item) { } -void ViewWrapper_qtquick::setObjectName(const QString &name) -{ - m_item->setObjectName(name); -} - QRect ViewWrapper_qtquick::geometry() const { if (isRootView()) { diff --git a/src/qtquick/views/ViewWrapper_qtquick.h b/src/qtquick/views/ViewWrapper_qtquick.h index 5d277c35..62b86187 100644 --- a/src/qtquick/views/ViewWrapper_qtquick.h +++ b/src/qtquick/views/ViewWrapper_qtquick.h @@ -27,7 +27,6 @@ public: explicit ViewWrapper_qtquick(QObject *widget); explicit ViewWrapper_qtquick(QQuickItem *widget); - void setObjectName(const QString &name) override; QRect geometry() const override; void setGeometry(QRect) override; void move(int x, int y) override; diff --git a/src/qtquick/views/View_qtquick.cpp b/src/qtquick/views/View_qtquick.cpp index 3b17493c..1e8f350e 100644 --- a/src/qtquick/views/View_qtquick.cpp +++ b/src/qtquick/views/View_qtquick.cpp @@ -731,11 +731,6 @@ std::shared_ptr View_qtquick::asWrapper() return std::shared_ptr(wrapper); } -void View_qtquick::setObjectName(const QString &name) -{ - QQuickItem::setObjectName(name); -} - void View_qtquick::grabMouse() { QQuickItem::grabMouse(); diff --git a/src/qtquick/views/View_qtquick.h b/src/qtquick/views/View_qtquick.h index 4e7aee7c..ebde212b 100644 --- a/src/qtquick/views/View_qtquick.h +++ b/src/qtquick/views/View_qtquick.h @@ -133,7 +133,6 @@ public: std::shared_ptr asWrapper() override; - void setObjectName(const QString &name) override; void grabMouse() override; void releaseMouse() override; void releaseKeyboard() override; diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp index c953dfee..5b79147d 100644 --- a/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp +++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.cpp @@ -115,11 +115,6 @@ ViewWrapper_qtwidgets::ViewWrapper_qtwidgets(QWidget *widget) { } -void ViewWrapper_qtwidgets::setObjectName(const QString &name) -{ - m_widget->setObjectName(name); -} - QRect ViewWrapper_qtwidgets::geometry() const { return m_widget->geometry(); diff --git a/src/qtwidgets/views/ViewWrapper_qtwidgets.h b/src/qtwidgets/views/ViewWrapper_qtwidgets.h index aeb6760c..312baf60 100644 --- a/src/qtwidgets/views/ViewWrapper_qtwidgets.h +++ b/src/qtwidgets/views/ViewWrapper_qtwidgets.h @@ -27,7 +27,6 @@ public: explicit ViewWrapper_qtwidgets(QObject *widget); explicit ViewWrapper_qtwidgets(QWidget *widget); - void setObjectName(const QString &name) override; QRect geometry() const override; void setGeometry(QRect) override; void move(int x, int y) override; diff --git a/src/qtwidgets/views/View_qtwidgets.h b/src/qtwidgets/views/View_qtwidgets.h index 98961aa8..5e19a1dd 100644 --- a/src/qtwidgets/views/View_qtwidgets.h +++ b/src/qtwidgets/views/View_qtwidgets.h @@ -353,11 +353,6 @@ public: std::shared_ptr asWrapper() override; - void setObjectName(const QString &name) override - { - QWidget::setObjectName(name); - } - void grabMouse() override { QWidget::grabMouse();