handful more of krazy fixes and i'm done for the night

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=776988

appletbrowser/customdragtreeview_p.h

@@ -17,6 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#ifndef CUSTOMDRAGTREEVIEW_P_H
+#define CUSTOMDRAGTREEVIEW_P_H
+
 #include <QTreeView>
 #include "kcategorizeditemsviewmodels_p.h"
 
@@ -35,3 +38,6 @@ private:
 
     friend class KCategorizedItemsView;
 };
+
+#endif
+

appletbrowser/plasmaappletitemmodel_p.h

@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMAAPPLETSMODEL_H_
-#define PLASMAAPPLETSMODEL_H_
+#ifndef PLASMAAPPLETITEMMODEL_P_H
+#define PLASMAAPPLETITEMMODEL_P_H
 
 #include <KPluginInfo>
 

applethandle.cpp

@@ -32,12 +32,11 @@
 #include <cmath>
 #include <math.h>
 
-#include "plasma/view.h"
 #include "applet.h"
 #include "containment.h"
 #include "corona.h"
-#include "applet.h"
 #include "theme.h"
+#include "view.h"
 
 namespace Plasma
 {

applethandle_p.h

@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMA_APPLETHANDLE
-#define PLASMA_APPLETHANDLE
+#ifndef PLASMA_APPLETHANDLE_P_H
+#define PLASMA_APPLETHANDLE_P_H
 
 #include <QtCore/QObject>
 #include <QtGui/QGraphicsItem>

datacontainer.cpp

@@ -17,14 +17,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "plasma.h"
 #include "datacontainer.h"
-#include "datacontainer_p.h"
 
 #include <QVariant>
 
 #include <KDebug>
 
+#include "plasma.h"
+#include "datacontainer_p.h"
+
 namespace Plasma
 {
 

desktoptoolbox_p.h

@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef PLASMA_DESKTOPTOOLBOX_H
-#define PLASMA_DESKTOPTOOLBOX_H
+#ifndef PLASMA_DESKTOPTOOLBOX_P_H
+#define PLASMA_DESKTOPTOOLBOX_P_H
 
 #include <QGraphicsItem>
 #include <QObject>

searchmatch.cpp

@@ -17,6 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "searchmatch.h"
 
 #include <QVariant>
 #include <QStringList>
@@ -24,8 +25,6 @@
 
 #include <KDebug>
 
-#include "searchmatch.h"
-
 #include "abstractrunner.h"
 
 namespace Plasma

searchmatch.h

@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef SEARCHACTION_H
-#define SEARCHACTION_H
+#ifndef SEARCHMATCH_H
+#define SEARCHMATCH_H
 
 #include <plasma/plasma_export.h>
 

widgets/signalplotter.cpp

@@ -20,6 +20,8 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "signalplotter.h"
+
 #include <math.h>
 #include <string.h>
 
@@ -38,8 +40,6 @@
 
 #include <plasma/svg.h>
 
-#include "signalplotter.h"
-
 namespace Plasma
 {
 

widgets/tooltip_p.h

@@ -17,8 +17,9 @@
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-#ifndef PLASMATOOLTIP_H
-#define PLASMATOOLTIP_H
+
+#ifndef PLASMA_TOOLTIP_P_H
+#define PLASMA_TOOLTIP_P_H
 
 #include <plasma/widgets/widget.h> //ToolTipData struct