From dd7b8b306b2c358b324f0164faec3eb2d965d852 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Sun, 22 Jul 2007 22:01:10 +0000
Subject: [PATCH] ebn fixes

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=691079
---
 applet.cpp       |  5 +++++
 applet.h         |  2 +-
 package.cpp      |  4 ++--
 packages_p.h     |  4 ++--
 widgets/icon.cpp |  4 +++-
 widgets/icon.h   | 10 +++++-----
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/applet.cpp b/applet.cpp
index 009c3ca89..0bcdc587c 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -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?
diff --git a/applet.h b/applet.h
index ca2b23ef6..95b9cac4c 100644
--- a/applet.h
+++ b/applet.h
@@ -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
diff --git a/package.cpp b/package.cpp
index e4c72a671..873dec811 100644
--- a/package.cpp
+++ b/package.cpp
@@ -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;
         }
diff --git a/packages_p.h b/packages_p.h
index a5f36e612..4b069f95e 100644
--- a/packages_p.h
+++ b/packages_p.h
@@ -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>
 
diff --git a/widgets/icon.cpp b/widgets/icon.cpp
index 58c560236..395135462 100644
--- a/widgets/icon.cpp
+++ b/widgets/icon.cpp
@@ -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
 {
diff --git a/widgets/icon.h b/widgets/icon.h
index fb771e885..7e0ddd1c5 100644
--- a/widgets/icon.h
+++ b/widgets/icon.h
@@ -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();