some krazy fixes

svn path=/trunk/KDE/kdebase/workspace/; revision=664331

atoms.cpp

@@ -9,8 +9,6 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-
-#include <QApplication>
 #include "atoms.h"
 #include "utils.h"
 #include <assert.h>

atoms.h

@@ -11,12 +11,14 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #ifndef KWIN_ATOMS_H
 #define KWIN_ATOMS_H
+
+#include <QApplication>
 #include <X11/Xlib.h>
 
 namespace KWin
 {
 
-class Atoms 
+class Atoms
     {
     public:
         Atoms();

clients/b2/b2client.cpp

@@ -37,8 +37,6 @@
 #include <QBitmap>
 #include <QLabel>
 
-#include <QPixmap>
-
 #include <X11/Xlib.h>
 #include <QX11Info>
 #include <KDebug>

clients/b2/b2client.h

@@ -157,6 +157,7 @@ private:
 
 class B2ClientFactory : public QObject, public KDecorationFactory
 {
+    Q_OBJECT
 public:
     B2ClientFactory();
     virtual ~B2ClientFactory();

clients/kwmtheme/kwmthemeclient.cpp

@@ -1,5 +1,6 @@
-#include <kconfig.h>
 #include "kwmthemeclient.h"
+
+#include <kconfig.h>
 #include <kglobal.h>
 #include <QLayout>
 #include <qdrawutil.h>

clients/laptop/laptopclient.cpp

@@ -13,7 +13,6 @@
 #include <QPixmap>
 #include <QPaintEvent>
 #include <kpixmapeffect.h>
-#include <QPixmap>
 #include <kdrawutil.h>
 #include <kglobal.h>
 #include <klocale.h>

clients/plastik/config/config.cpp

@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 
-#include "config.h"
+#include <config.h>
 
 PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
     : QObject(parent), m_config(0), m_dialog(0)

clients/plastik/plastikbutton.cpp

@@ -20,6 +20,8 @@
   Boston, MA 02110-1301, USA.
  */
 
+#include "plastikbutton.h"
+
 // #include <kwin/options.h>
 
 #include <QAbstractButton>
@@ -28,10 +30,8 @@
 #include <QPainter>
 #include <QPixmap>
 #include <kpixmapeffect.h>
-#include <QPixmap>
 #include <QTimer>
 
-#include "plastikbutton.h"
 #include "plastikbutton.moc"
 #include "plastikclient.h"
 #include "misc.h"

clients/quartz/quartz.cpp

@@ -24,11 +24,9 @@
 #include <QImage>
 #include <QPixmap>
 #include <QApplication>
+#include <QPaintEvent>
 
 #include "quartz.h"
-//Added by qt3to4:
-#include <QPixmap>
-#include <QPaintEvent>
 
 
 namespace Quartz {

effects/mousemark.cpp

@@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config-X11.h>
-
 #include "mousemark.h"
 
+#include <config-X11.h>
+
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kglobal.h>

effects/showfps.cpp

@@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config-X11.h>
-
 #include "showfps.h"
 
+#include <config-X11.h>
+
 #include <kconfig.h>
 #include <ksharedconfig.h>
 

effects/trackmouse.cpp

@@ -8,10 +8,10 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
-#include <config-X11.h>
-
 #include "trackmouse.h"
 
+#include <config-X11.h>
+
 #include <kglobal.h>
 #include <kstandarddirs.h>
 

lib/kdecoration_plugins_p.cpp

@@ -32,7 +32,6 @@ DEALINGS IN THE SOFTWARE.
 #include <klibloader.h>
 #include <kconfiggroup.h>
 #include <assert.h>
-#include <kconfig.h>
 
 #include <QDir>
 #include <QFile>

main.cpp

@@ -9,11 +9,11 @@ You can Freely distribute this program under the GNU General Public
 License. See the file "COPYING" for the exact licensing terms.
 ******************************************************************/
 
+#include "main.h"
+
 //#define QT_CLEAN_NAMESPACE
 #include <ksharedconfig.h>
 
-#include "main.h"
-
 #include <kglobal.h>
 #include <klocale.h>
 #include <stdlib.h>

scene_xrender.h

@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef KWIN_SCENE_XRENDER_H
 #define KWIN_SCENE_XRENDER_H
 
-#include "config.h"
+#include <config.h>
 
 #include "scene.h"
 

workspace.cpp

@@ -1138,7 +1138,7 @@ void Workspace::configureWM()
 /*!
   avoids managing a window with title \a title
  */
-void Workspace::doNotManage( QString title )
+void Workspace::doNotManage( const QString &title )
     {
     doNotManageList.append( title );
     }
@@ -1636,7 +1636,7 @@ void Workspace::checkActiveScreen( const Client* c )
     }
 
 // called e.g. when a user clicks on a window, set active screen to be the screen
-// where the click occured
+// where the click occurred
 void Workspace::setActiveScreenMouse( QPoint mousepos )
     {
     if( !options->xineramaEnabled )

workspace.h

@@ -251,7 +251,7 @@ class Workspace : public QObject, public KDecorationDefines
     // dcop interface
         void cascadeDesktop();
         void unclutterDesktop();
-        void doNotManage(QString);
+        void doNotManage( const QString & );
         bool setCurrentDesktop( int new_desktop );
         void nextDesktop();
         void previousDesktop();