alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SVN_SILENT: ease giulio's pain in generate diffs

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1171395
This commit is contained in:
Aaron J. Seigo 2010-09-03 18:09:18 +00:00
parent baa2c64f61
commit f02786e31a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applet.cpp
View File

@ -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)

2
containment.cpp
View File

@ -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());
}

4
extenders/extender.cpp
View File

@ -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.";