Lotsa little ebn fixes.
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=805672
This commit is contained in:
parent
b97d911e56
commit
f57cc1c623
|
@ -55,7 +55,7 @@ public:
|
|||
const QString api = runnerDescription.property("X-Plasma-API").toString();
|
||||
if (!api.isEmpty()) {
|
||||
const QString path = KStandardDirs::locate("data",
|
||||
"plasma/runners/" + runnerDescription.pluginName() + "/");
|
||||
"plasma/runners/" + runnerDescription.pluginName() + '/');
|
||||
PackageStructure::Ptr structure = Plasma::packageStructure(api, Plasma::RunnerComponent);
|
||||
structure->setPath(path);
|
||||
package = new Package(path, structure);
|
||||
|
|
|
@ -18,8 +18,8 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef ANIMATORDRIVER_H
|
||||
#define ANIMATORDRIVER_H
|
||||
#ifndef ANIMATIONDRIVER_H
|
||||
#define ANIMATIONDRIVER_H
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QRegion>
|
||||
|
|
8
applet.h
8
applet.h
|
@ -190,10 +190,10 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget
|
|||
QRect mapToView(const QGraphicsView *view, const QRectF &rect) const;
|
||||
|
||||
/**
|
||||
* Recomended position for a popup window like a menu or a tooltip
|
||||
* Reccomended position for a popup window like a menu or a tooltip
|
||||
* given its size
|
||||
* @param s size of the popup
|
||||
* @returns recomended position
|
||||
* @returns reccomended position
|
||||
*/
|
||||
QPoint popupPosition(const QSize &s) const;
|
||||
|
||||
|
@ -221,12 +221,12 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget
|
|||
virtual Location location() const;
|
||||
|
||||
/**
|
||||
* @return the prefered aspect ratio mode for placement and resizing
|
||||
* @return the preferred aspect ratio mode for placement and resizing
|
||||
*/
|
||||
Plasma::AspectRatioMode aspectRatioMode() const;
|
||||
|
||||
/**
|
||||
* Sets the prefered aspect ratio mode for placement and resizing
|
||||
* Sets the preferred aspect ratio mode for placement and resizing
|
||||
*/
|
||||
void setAspectRatioMode(Plasma::AspectRatioMode);
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ class PLASMA_EXPORT AppletBrowserWidget : public QWidget
|
|||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
AppletBrowserWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
|
||||
explicit AppletBrowserWidget(QWidget *parent = 0, Qt::WindowFlags f = 0);
|
||||
virtual ~AppletBrowserWidget();
|
||||
|
||||
void setApplication(const QString& application = QString());
|
||||
|
|
|
@ -126,7 +126,7 @@ void OpenWidgetAssistant::prepPage(KPageWidgetItem *current, KPageWidgetItem *be
|
|||
} else {
|
||||
QString filter = m_packageStructureService->property("X-Plasma-PackageFileFilter").toString();
|
||||
if (!filter.isEmpty()) {
|
||||
m_fileDialog->setFilter( + "|" + m_packageStructureService->name());
|
||||
m_fileDialog->setFilter( + '|' + m_packageStructureService->name());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
|
|
@ -639,7 +639,7 @@ void Containment::dropEvent(QGraphicsSceneDragDropEvent *event)
|
|||
|
||||
void Containment::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
|
||||
{
|
||||
//FIXME Qt4.4 check to see if this is still necessary to avoid unecessary repaints
|
||||
//FIXME Qt4.4 check to see if this is still necessary to avoid unnecessary repaints
|
||||
// check with QT_FLUSH_PAINT=1 and mouse through applets that accept hover,
|
||||
// applets that don't and system windows
|
||||
if (event->spontaneous()) {
|
||||
|
@ -650,7 +650,7 @@ void Containment::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
|
|||
|
||||
void Containment::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
|
||||
{
|
||||
//FIXME Qt4.4 check to see if this is still necessary to avoid unecessary repaints
|
||||
//FIXME Qt4.4 check to see if this is still necessary to avoid unnecessary repaints
|
||||
// check with QT_FLUSH_PAINT=1 and mouse through applets that accept hover,
|
||||
// applets that don't and system windows
|
||||
// Applet::hoverLeaveEvent(event);
|
||||
|
|
|
@ -40,7 +40,7 @@ using namespace Plasma;
|
|||
namespace Plasma
|
||||
{
|
||||
|
||||
// constant controling how long between requesting a configuration sync
|
||||
// constant controlling how long between requesting a configuration sync
|
||||
// and one happening should occur. currently 2 minutes.
|
||||
const int CONFIG_SYNC_TIMEOUT = 120000;
|
||||
|
||||
|
|
|
@ -18,13 +18,13 @@
|
|||
*/
|
||||
|
||||
#include "datacontainer.h"
|
||||
#include "datacontainer_p.h"
|
||||
|
||||
#include <QVariant>
|
||||
|
||||
#include <KDebug>
|
||||
|
||||
#include "plasma.h"
|
||||
#include "datacontainer_p.h"
|
||||
|
||||
namespace Plasma
|
||||
{
|
||||
|
|
|
@ -421,7 +421,7 @@ DataEngine::Private::Private(DataEngine* e, KService::Ptr service)
|
|||
|
||||
if (!api.isEmpty()) {
|
||||
const QString path = KStandardDirs::locate("data",
|
||||
"plasma/engines/" + dataEngineDescription.pluginName() + "/");
|
||||
"plasma/engines/" + dataEngineDescription.pluginName() + '/');
|
||||
PackageStructure::Ptr structure = Plasma::packageStructure(api, Plasma::RunnerComponent);
|
||||
structure->setPath(path);
|
||||
package = new Package(path, structure);
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "runnermanager.h"
|
||||
|
||||
#include <KServiceTypeTrader>
|
||||
#include <KPluginInfo>
|
||||
#include <KDebug>
|
||||
|
@ -39,8 +41,6 @@
|
|||
|
||||
#include "querymatch.h"
|
||||
|
||||
#include "runnermanager.h"
|
||||
|
||||
using ThreadWeaver::Weaver;
|
||||
using ThreadWeaver::Job;
|
||||
|
||||
|
|
|
@ -102,7 +102,7 @@ class PLASMA_EXPORT RunnerManager : public QObject
|
|||
|
||||
Q_SIGNALS:
|
||||
/**
|
||||
* Emited each time a new match is added to the list
|
||||
* Emitted each time a new match is added to the list
|
||||
*/
|
||||
void matchesChanged(const QList<Plasma::QueryMatch> &matches);
|
||||
|
||||
|
|
|
@ -196,7 +196,7 @@ void Theme::setThemeName(const QString &themeName)
|
|||
}
|
||||
|
||||
//TODO: should we care about names with relative paths in them?
|
||||
QString themePath = KStandardDirs::locate("data", "desktoptheme/" + theme + "/");
|
||||
QString themePath = KStandardDirs::locate("data", "desktoptheme/" + theme + '/');
|
||||
if (themePath.isEmpty() && d->themeName.isEmpty()) {
|
||||
themePath = KStandardDirs::locate("data", "desktoptheme/default/");
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@ public:
|
|||
|
||||
/**
|
||||
* @return optimal size given a size for the icon
|
||||
* @param iconWidth desidered width of the icon
|
||||
* @param iconWidth desired width of the icon
|
||||
*/
|
||||
QSizeF sizeFromIconSize(const qreal iconWidth) const;
|
||||
|
||||
|
|
|
@ -60,12 +60,12 @@ public:
|
|||
QString format() const;
|
||||
|
||||
/**
|
||||
* @return wether the Plasma::ProgressBar is inverted or not.
|
||||
* @return whether the Plasma::ProgressBar is inverted or not.
|
||||
*/
|
||||
bool invertedAppearance();
|
||||
|
||||
/**
|
||||
* @return wether the text is visible or not.
|
||||
* @return whether the text is visible or not.
|
||||
*/
|
||||
bool isTextVisible() const;
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@ void ToolTip::show(Plasma::Widget *widget)
|
|||
d->showTimer->stop();
|
||||
|
||||
if (d->isShown) {
|
||||
// small delay to prevent unecessary showing when the mouse is moving quickly across items
|
||||
// small delay to prevent unnecessary showing when the mouse is moving quickly across items
|
||||
// which can be too much for less powerful CPUs to keep up with
|
||||
d->showTimer->start(200);
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue
Block a user