From 3bd1d939e886b488cbb79fb81140fac1f547a578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Tue, 9 Apr 2013 03:50:43 +0200 Subject: [PATCH] remove maincomponent and target properties from tooltipproxy --- src/declarativeimports/core/tooltip.cpp | 23 ----------------------- src/declarativeimports/core/tooltip.h | 22 ++++------------------ 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/src/declarativeimports/core/tooltip.cpp b/src/declarativeimports/core/tooltip.cpp index 01399a0cb..0bac7515e 100644 --- a/src/declarativeimports/core/tooltip.cpp +++ b/src/declarativeimports/core/tooltip.cpp @@ -37,29 +37,6 @@ ToolTip::~ToolTip() { } -QQuickItem *ToolTip::target() const -{ - return m_target.data(); -} - -void ToolTip::setTarget(QQuickItem *target) -{ - if (m_target.data() != target) { - m_target = target; - emit targetChanged(); - } -} - -QQmlComponent* ToolTip::mainComponent() const -{ - return m_mainComponent.data(); -} - -void ToolTip::setMainComponent(QQmlComponent* mainComponent) -{ - m_mainComponent = mainComponent; -} - QQuickItem *ToolTip::mainItem() const { return m_mainItem.data(); diff --git a/src/declarativeimports/core/tooltip.h b/src/declarativeimports/core/tooltip.h index 76ca61f9d..695e493a9 100644 --- a/src/declarativeimports/core/tooltip.h +++ b/src/declarativeimports/core/tooltip.h @@ -32,23 +32,19 @@ class QQuickItem; class QGraphicsWidget; /** - * Exposed as `ToolTipProxy` in QML. + * Exposed as `ToolTipProxy` in QML. This is used only internally for WIndow handling + * + * DO NOT USE THIS API, PlasmaCore.ToolTip is what you should use. */ class ToolTip : public QObject { Q_OBJECT /** - * The item that will display this tooltip on mouse over - */ - Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged) - - /** - * T + * The item shown inside the tooltip. */ Q_PROPERTY(QQuickItem *mainItem READ mainItem WRITE setMainItem NOTIFY mainItemChanged) - /** * The main QML item that will be displayed in the Dialog */ @@ -64,12 +60,6 @@ public: ToolTip(QObject *parent = 0); ~ToolTip(); - QQuickItem *target() const; - void setTarget(QQuickItem *target); - - QQmlComponent* mainComponent() const; - void setMainComponent(QQmlComponent *mainComponent); - QQuickItem *mainItem() const; void setMainItem(QQuickItem *mainItem); @@ -83,18 +73,14 @@ public: Q_SIGNALS: void targetChanged(); - void mainComponentChanged(); void mainItemChanged(); void visualParentChanged(); void visibleChanged(); private: QTimer *m_syncTimer; - QWeakPointer m_mainComponent; QWeakPointer m_mainItem; QWeakPointer m_visualParent; - QWeakPointer m_declarativeItemContainer; - QWeakPointer m_target; }; #endif