From f02786e31ac946adc076c67299126ad6c7ae1fa2 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Fri, 3 Sep 2010 18:09:18 +0000
Subject: [PATCH] SVN_SILENT: ease giulio's pain in generate diffs

svn path=/trunk/KDE/kdelibs/; revision=1171395
---
 applet.cpp             | 2 +-
 containment.cpp        | 2 +-
 extenders/extender.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applet.cpp b/applet.cpp
index ecc402190..ab68ad78f 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -2150,7 +2150,7 @@ QString AppletPrivate::parentAppConstraint(const QString &parentApp)
 
 KPluginInfo::List Applet::listAppletInfo(const QString &category, const QString &parentApp)
 {
-   return PluginLoader::pluginLoader()->listAppletInfo(category, parentApp); 
+   return PluginLoader::pluginLoader()->listAppletInfo(category, parentApp);
 }
 
 KPluginInfo::List Applet::listAppletInfoForMimetype(const QString &mimetype)
diff --git a/containment.cpp b/containment.cpp
index 1eac230a9..dd3568e5d 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -1049,7 +1049,7 @@ void Containment::setScreen(int newScreen, int newDesktop)
         }
     }
 
-    if (newScreen < numScreens && newScreen > -1 && 
+    if (newScreen < numScreens && newScreen > -1 &&
         (d->type == DesktopContainment || d->type >= CustomContainment)) {
         resize(corona()->screenGeometry(newScreen).size());
     }
diff --git a/extenders/extender.cpp b/extenders/extender.cpp
index 500dda44a..f52b9a552 100644
--- a/extenders/extender.cpp
+++ b/extenders/extender.cpp
@@ -39,7 +39,7 @@
 #include "widgets/label.h"
 
 #include "private/applet_p.h"
-#include "private/applethandle_p.h"
+#include "private/abstracthandle.h"
 #include "private/extender_p.h"
 #include "private/extenderapplet_p.h"
 #include "private/extenderitem_p.h"
@@ -434,7 +434,7 @@ void Extender::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
             //Hide empty internal extender containers when we drag the last item away. Avoids having
             //an ugly empty applet on the desktop temporarily.
             ExtenderApplet *extenderApplet = qobject_cast<ExtenderApplet*>(d->applet.data());
-            if (extenderApplet && sourceExtender == this && attachedItems().count() < 2 && 
+            if (extenderApplet && sourceExtender == this && attachedItems().count() < 2 &&
                 extenderApplet->formFactor() != Plasma::Horizontal &&
                 extenderApplet->formFactor() != Plasma::Vertical) {
                 kDebug() << "leaving the internal extender container, so hide the applet and it's handle.";