Remove Window::setProperty/property
Mostly unused and much easier to use a member variable.
This commit is contained in:
@@ -79,9 +79,6 @@ public:
|
||||
/// title bar, but can also be done programatically.
|
||||
virtual bool isActive() const = 0;
|
||||
|
||||
virtual void setProperty(const char *name, const QVariant &value) = 0;
|
||||
virtual QVariant property(const char *name) const = 0;
|
||||
|
||||
/// @brief Returns the root view of this window
|
||||
/// For example, for QtWidgets, this would be the top-level QWidget
|
||||
/// represented by this QWindow
|
||||
|
||||
@@ -56,15 +56,6 @@ QRect Window_dummy::geometry() const
|
||||
return {};
|
||||
}
|
||||
|
||||
void Window_dummy::setProperty(const char *, const QVariant &)
|
||||
{
|
||||
}
|
||||
|
||||
QVariant Window_dummy::property(const char *) const
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
bool Window_dummy::isVisible() const
|
||||
{
|
||||
return {};
|
||||
|
||||
@@ -27,8 +27,6 @@ public:
|
||||
|
||||
void setWindowState(Qt::WindowState) override;
|
||||
QRect geometry() const override;
|
||||
void setProperty(const char *name, const QVariant &value) override;
|
||||
QVariant property(const char *name) const override;
|
||||
bool isVisible() const override;
|
||||
WId handle() const override;
|
||||
bool equals(std::shared_ptr<Window> other) const override;
|
||||
|
||||
@@ -49,12 +49,6 @@ QRect Window_qt::geometry() const
|
||||
return m_window->geometry();
|
||||
}
|
||||
|
||||
void Window_qt::setProperty(const char *name, const QVariant &value)
|
||||
{
|
||||
Q_ASSERT(m_window);
|
||||
m_window->setProperty(name, value);
|
||||
}
|
||||
|
||||
bool Window_qt::isVisible() const
|
||||
{
|
||||
return m_window->isVisible();
|
||||
@@ -118,11 +112,6 @@ void Window_qt::destroy()
|
||||
delete m_window;
|
||||
}
|
||||
|
||||
QVariant Window_qt::property(const char *name) const
|
||||
{
|
||||
return m_window->property(name);
|
||||
}
|
||||
|
||||
QSize Window_qt::minSize() const
|
||||
{
|
||||
return m_window->minimumSize();
|
||||
|
||||
@@ -33,9 +33,6 @@ public:
|
||||
void setVisible(bool) override;
|
||||
WId handle() const override;
|
||||
|
||||
// TODOm3: Remove
|
||||
void setProperty(const char *name, const QVariant &value) override;
|
||||
QVariant property(const char *name) const override;
|
||||
bool equals(std::shared_ptr<Window> other) const override;
|
||||
void setFramePosition(QPoint targetPos) override;
|
||||
void resize(int width, int height) override;
|
||||
|
||||
@@ -32,10 +32,8 @@ inline QWindow *windowForWidget(QWidget *topLevel)
|
||||
|
||||
Window_qtwidgets::Window_qtwidgets(QWidget *topLevel)
|
||||
: Window_qt(windowForWidget(topLevel))
|
||||
, m_widget(topLevel)
|
||||
{
|
||||
// QWidgetWindow is private API, we have no way for going from QWindow to the top-level QWidget
|
||||
// So set it as a property
|
||||
setProperty("kddockwidgets_qwidget", QVariant::fromValue<QWidget *>(topLevel));
|
||||
}
|
||||
|
||||
std::shared_ptr<View> Window_qtwidgets::rootView() const
|
||||
@@ -43,8 +41,8 @@ std::shared_ptr<View> Window_qtwidgets::rootView() const
|
||||
if (!m_window)
|
||||
return {};
|
||||
|
||||
if (QWidget *widget = m_window->property("kddockwidgets_qwidget").value<QWidget *>())
|
||||
return std::shared_ptr<View>(new Views::ViewWrapper_qtwidgets(widget));
|
||||
if (m_widget)
|
||||
return std::shared_ptr<View>(new Views::ViewWrapper_qtwidgets(m_widget));
|
||||
|
||||
qWarning() << Q_FUNC_INFO << "Window does not have a root";
|
||||
return nullptr;
|
||||
|
||||
@@ -27,6 +27,9 @@ public:
|
||||
void setVisible(bool) override;
|
||||
bool supportsHonouringLayoutMinSize() const override;
|
||||
void destroy() override;
|
||||
|
||||
private:
|
||||
QWidget *m_widget = nullptr;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user