ebn fixes

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=691079
This commit is contained in:
Aaron J. Seigo 2007-07-22 22:01:10 +00:00
parent cf70eb1f86
commit dd7b8b306b
6 changed files with 18 additions and 11 deletions

View File

@ -331,6 +331,11 @@ void Applet::setFailedToLaunch(bool failed, const QString& reason)
update();
}
int Applet::type() const
{
return Type;
}
QRectF Applet::boundingRect () const
{
//FIXME: this should be big enough to allow for the failure text?

View File

@ -337,7 +337,7 @@ class PLASMA_EXPORT Applet : public QObject, public Widget
/**
* Reimplemented from QGraphicsItem
**/
int type() const { return Type; }
int type() const;
/**
* Reimplemented from QGraphicsItem

View File

@ -73,14 +73,14 @@ bool Package::isValid()
}
foreach (const QString& dir, d->structure.requiredDirectories()) {
if (QFile::exists(d->basePath + "/" + dir)) {
if (QFile::exists(d->basePath + '/' + dir)) {
d->valid = false;
return false;
}
}
foreach (const QString& file, d->structure.requiredFiles()) {
if (QFile::exists(d->basePath + "/" + file)) {
if (QFile::exists(d->basePath + '/' + file)) {
d->valid = false;
return false;
}

View File

@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA. *
*******************************************************************************/
#ifndef PLASMA_PACKAGES
#define PLASMA_PACKAGES
#ifndef PLASMA_PACKAGES_H // krazy:exclude=includes
#define PLASMA_PACKAGES_H
#include <plasma/packagestructure.h>

View File

@ -17,6 +17,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "icon.h"
#include <QAction>
#include <QApplication>
#include <QPainter>
#include <QGraphicsSceneMouseEvent>
@ -38,7 +41,6 @@
#include "phase.h"
#include "svg.h"
#include "effects/blur.cpp"
#include "icon.h"
namespace Plasma
{

View File

@ -20,15 +20,15 @@
#ifndef ICON_H
#define ICON_H
#include <QObject>
#include <QGraphicsTextItem>
#include <QAction>
#include <QtCore/QObject>
#include <QtGui/QGraphicsTextItem>
#include <plasma/dataengine.h>
#include <plasma/phase.h>
#include <plasma/plasma_export.h>
#include <plasma/widgets/layoutitem.h>
class QAction;
class KUrl;
//TODO
@ -41,8 +41,8 @@ class PLASMA_EXPORT Icon : public QObject, public QGraphicsItem, public LayoutIt
{
Q_OBJECT
public:
Icon(QGraphicsItem *parent = 0);
Icon(const QString &text, QGraphicsItem *parent = 0);
explicit Icon(QGraphicsItem *parent = 0);
explicit Icon(const QString &text, QGraphicsItem *parent = 0);
Icon(const QIcon & icon, const QString &text, QGraphicsItem *parent = 0);
virtual ~Icon();