From af043ca588914dd52f8fbc8baa5f815a9d1b3384 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Fri, 20 Jul 2007 08:06:27 +0000 Subject: [PATCH] too tired to do much of anything else, i figured i could fix some ebn issues svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=690173 --- animator.cpp | 4 ++-- animator.h | 6 +++--- applet.cpp | 4 ++-- applet.h | 2 +- corona.h | 2 +- dataenginemanager.h | 4 ++-- effects/blur.cpp | 17 +++++++++++++++++ package.cpp | 3 ++- packages.cpp | 4 ++-- phase.cpp | 2 +- phase.h | 2 +- widgets/lineedit.cpp | 2 +- widgets/lineedit.h | 2 +- widgets/pushbutton.cpp | 5 +++++ widgets/pushbutton.h | 2 +- 15 files changed, 42 insertions(+), 19 deletions(-) diff --git a/animator.cpp b/animator.cpp index a6dcc0136..e18f16a04 100644 --- a/animator.cpp +++ b/animator.cpp @@ -109,14 +109,14 @@ void Animator::frameAppear(qreal frame, QGraphicsItem* item, const QRegion& draw Q_UNUSED(drawable) } -void Animator::slideIn(qreal progress, QGraphicsItem* item, QPoint destination) +void Animator::slideIn(qreal progress, QGraphicsItem *item, const QPoint &destination) { kDebug()<translate(-destination.x(),-destination.y()); } -void Animator::slideOut(qreal progress, QGraphicsItem* item, QPoint destination) +void Animator::slideOut(qreal progress, QGraphicsItem *item, const QPoint &destination) { Q_UNUSED(progress); //kDebug()<%1", reason); + text = i18n("This object could not be created for the following reason:

%1

", reason); } return text; diff --git a/applet.h b/applet.h index e8ba64fb5..cc0b5e4fc 100644 --- a/applet.h +++ b/applet.h @@ -285,7 +285,7 @@ class PLASMA_EXPORT Applet : public QObject, public Widget /** * Sets whether or not this applet is immutable or not. * - * @arg immutable true if this applet should not be changable + * @arg immutable true if this applet should not be changeable **/ void setImmutable(bool immutable); diff --git a/corona.h b/corona.h index 04207a07f..5c425da69 100644 --- a/corona.h +++ b/corona.h @@ -45,7 +45,7 @@ public: ~Corona(); /** - * The applets and Corona surface are changable or not + * The applets and Corona surface are changeable or not **/ bool immutable() const; diff --git a/dataenginemanager.h b/dataenginemanager.h index 58463fe96..d56ee2cf4 100644 --- a/dataenginemanager.h +++ b/dataenginemanager.h @@ -16,8 +16,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef PLASMA_ENGINE_MANAGER_H -#define PLASMA_ENGINE_MANAGER_H +#ifndef PLASMA_DATAENGINEMANAGER_H +#define PLASMA_DATAENGINEMANAGER_H #include #include diff --git a/effects/blur.cpp b/effects/blur.cpp index 7a4f16c6b..9b4cded0e 100644 --- a/effects/blur.cpp +++ b/effects/blur.cpp @@ -1,3 +1,20 @@ +/* + * Copyright 2007 Jani Huhtanen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License version 2 as + * published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ #include diff --git a/package.cpp b/package.cpp index 1e3a64d94..e4c72a671 100644 --- a/package.cpp +++ b/package.cpp @@ -17,6 +17,8 @@ * Boston, MA 02110-1301, USA. * *******************************************************************************/ +#include "package.h" + #include #include @@ -30,7 +32,6 @@ #include #include -#include "package.h" #include "packagemetadata.h" #include "packagestructure.h" diff --git a/packages.cpp b/packages.cpp index 843c300a1..416988355 100644 --- a/packages.cpp +++ b/packages.cpp @@ -17,10 +17,10 @@ * Boston, MA 02110-1301, USA. * *******************************************************************************/ -#include - #include "packages_p.h" +#include + namespace Plasma { diff --git a/phase.cpp b/phase.cpp index 2d3214783..64e34ebf6 100644 --- a/phase.cpp +++ b/phase.cpp @@ -215,7 +215,7 @@ void Phase::animateItem(QGraphicsItem* item, Animation animation) } } -void Phase::moveItem(QGraphicsItem* item, Movement movement, QPoint destination) +void Phase::moveItem(QGraphicsItem* item, Movement movement, const QPoint &destination) { //kDebug()<::iterator it = d->movingItems.find(item); diff --git a/phase.h b/phase.h index ad9bce826..2aa78feff 100644 --- a/phase.h +++ b/phase.h @@ -83,7 +83,7 @@ public: ~Phase(); void animateItem(QGraphicsItem* item, Animation anim); - void moveItem(QGraphicsItem* item, Movement movement, QPoint destination); + void moveItem(QGraphicsItem* item, Movement movement, const QPoint &destination); void render(QGraphicsItem* item, QImage& image, RenderOp op); AnimId animateElement(QGraphicsItem *obj, ElementAnimation); diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp index f5bf6dd6f..d3d4107ef 100644 --- a/widgets/lineedit.cpp +++ b/widgets/lineedit.cpp @@ -156,7 +156,7 @@ QSizeF LineEdit::sizeHint() const return document()->size(); } -void LineEdit::setDefaultText(QString text) +void LineEdit::setDefaultText(const QString &text) { d->defaultText = text.simplified(); d->defaultText = QString("") + d->defaultText + QString(""); diff --git a/widgets/lineedit.h b/widgets/lineedit.h index b60300fea..1db0f574e 100644 --- a/widgets/lineedit.h +++ b/widgets/lineedit.h @@ -62,7 +62,7 @@ class PLASMA_EXPORT LineEdit : public QGraphicsTextItem, public LayoutItem void setGeometry(const QRectF& geometry); QSizeF sizeHint() const; - void setDefaultText(QString text); + void setDefaultText(const QString &text); const QString toHtml(); const QString toPlainText(); diff --git a/widgets/pushbutton.cpp b/widgets/pushbutton.cpp index 6c89d3248..aafc71371 100644 --- a/widgets/pushbutton.cpp +++ b/widgets/pushbutton.cpp @@ -247,4 +247,9 @@ QRect PushButton::geometry() const return boundingRect().toRect(); } +bool PushButton::isEmpty() const +{ + return false; +} + } // namespace Plasma diff --git a/widgets/pushbutton.h b/widgets/pushbutton.h index 2f997f718..91b8eb337 100644 --- a/widgets/pushbutton.h +++ b/widgets/pushbutton.h @@ -83,7 +83,7 @@ class PLASMA_EXPORT PushButton : public QObject, public QGraphicsItem, public QL virtual Qt::Orientations expandingDirections() const; virtual void setGeometry(const QRect& r); virtual QRect geometry() const ; - virtual bool isEmpty() const {return false;} + virtual bool isEmpty() const; Q_SIGNALS: void clicked();