From a84cf857e632c6722a15e445f78581675443be21 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 20 Oct 2009 16:47:18 +0000
Subject: [PATCH] simplify this a bit for readability's sake

svn path=/trunk/KDE/kdelibs/; revision=1038116
---
 popupapplet.cpp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/popupapplet.cpp b/popupapplet.cpp
index fc4a9c9ee..4559427ec 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -571,7 +571,8 @@ PopupAppletPrivate::~PopupAppletPrivate()
 
 void PopupAppletPrivate::internalTogglePopup()
 {
-    if (!dialog) {
+    Plasma::Dialog *d = dialog.data();
+    if (!d) {
         q->setFocus(Qt::ShortcutFocusReason);
         return;
     }
@@ -584,14 +585,14 @@ void PopupAppletPrivate::internalTogglePopup()
         timer->stop();
     }
 
-    if (dialog.data()->isVisible()) {
+    if (d->isVisible()) {
         if (q->location() != Floating) {
-            dialog.data()->animatedHide(locationToInverseDirection(q->location()));
+            d->animatedHide(locationToInverseDirection(q->location()));
         } else {
-            dialog.data()->hide();
+            d->hide();
         }
 
-        dialog.data()->clearFocus();
+        d->clearFocus();
     } else {
         if (q->graphicsWidget() &&
             q->graphicsWidget() == static_cast<Applet*>(q)->d->extender &&
@@ -603,17 +604,17 @@ void PopupAppletPrivate::internalTogglePopup()
         ToolTipManager::self()->hide(q);
         updateDialogPosition();
 
-        KWindowSystem::setOnAllDesktops(dialog.data()->winId(), true);
-        KWindowSystem::setState(dialog.data()->winId(), NET::SkipTaskbar | NET::SkipPager);
+        KWindowSystem::setOnAllDesktops(d->winId(), true);
+        KWindowSystem::setState(d->winId(), NET::SkipTaskbar | NET::SkipPager);
 
         if (q->location() != Floating) {
-            dialog.data()->animatedShow(locationToDirection(q->location()));
+            d->animatedShow(locationToDirection(q->location()));
         } else {
-            dialog.data()->show();
+            d->show();
         }
 
-        if (!(dialog.data()->windowFlags() & Qt::X11BypassWindowManagerHint)) {
-            KWindowSystem::activateWindow(dialog.data()->winId());
+        if (!(d->windowFlags() & Qt::X11BypassWindowManagerHint)) {
+            KWindowSystem::activateWindow(d->winId());
         }
     }
 }