From f412d1a9d0e063100947768085703a75d3eb7959 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 18 Mar 2014 21:38:02 +0100
Subject: [PATCH] remove :frameSvgItem()

---
 src/declarativeimports/core/dialog.cpp        | 11 ++++++-----
 src/declarativeimports/core/dialog.h          |  2 --
 src/declarativeimports/core/tooltipdialog.cpp |  1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/declarativeimports/core/dialog.cpp b/src/declarativeimports/core/dialog.cpp
index 9be1809bb..20855d20b 100644
--- a/src/declarativeimports/core/dialog.cpp
+++ b/src/declarativeimports/core/dialog.cpp
@@ -534,6 +534,12 @@ void Dialog::setType(WindowType type)
         setFlags(Qt::FramelessWindowHint|flags());
     }
 
+    if (type == Tooltip) {
+        d->frameSvgItem->setImagePath("widgets/tooltip");
+    } else {
+        d->frameSvgItem->setImagePath("dialogs/background");
+    }
+
     if (type == Dock) {
         KWindowSystem::setOnAllDesktops(winId(), true);
     } else {
@@ -548,11 +554,6 @@ Dialog::WindowType Dialog::type() const
     return d->type;
 }
 
-Plasma::FrameSvgItem *Dialog::frameSvgItem()
-{
-    return d->frameSvgItem;
-}
-
 void Dialog::focusInEvent(QFocusEvent *ev)
 {
     QQuickWindow::focusInEvent(ev);
diff --git a/src/declarativeimports/core/dialog.h b/src/declarativeimports/core/dialog.h
index fc35416a4..f517c7527 100644
--- a/src/declarativeimports/core/dialog.h
+++ b/src/declarativeimports/core/dialog.h
@@ -176,8 +176,6 @@ protected:
     void hideEvent(QHideEvent *event);
     bool event(QEvent *event);
 
-    Plasma::FrameSvgItem *frameSvgItem();
-
     virtual void classBegin();
     virtual void componentComplete();
 
diff --git a/src/declarativeimports/core/tooltipdialog.cpp b/src/declarativeimports/core/tooltipdialog.cpp
index 2c4e1d544..812b4e76a 100644
--- a/src/declarativeimports/core/tooltipdialog.cpp
+++ b/src/declarativeimports/core/tooltipdialog.cpp
@@ -39,7 +39,6 @@ ToolTipDialog::ToolTipDialog(QQuickItem  *parent)
     setFlags(Qt::ToolTip);
     setLocation(Plasma::Types::Floating);
     setDirection(Plasma::Types::Up);
-    frameSvgItem()->setImagePath("widgets/tooltip");
 
     m_animation = new QPropertyAnimation(this);
     connect(m_animation, SIGNAL(valueChanged(QVariant)),