Build

The error I got:
[ 43%] Building CXX object workspace/kwin/lib/CMakeFiles/kdecorations.dir/kcommondecoration.o
/home/kde4-devel/qt-copy/include/QtGui/../../src/gui/widgets/qabstractbutton.h: In member function 'void QAbstractButton::qt_check_for_QOBJECT_macro(const T&) const 
[with T = KCommonDecorationButton]':
/home/kde4-devel/qt-copy/include/QtCore/../../src/corelib/kernel/qobject.h:411:   instantiated from 'T qobject_cast(QObject*) [with T = KCommonDecorationButton*]'
/home/kde4-devel/kde/src/kdebase/workspace/kwin/lib/kcommondecoration.cpp:203:   instantiated from here
/home/kde4-devel/qt-copy/include/QtGui/../../src/gui/widgets/qabstractbutton.h:40: error: void value not ignored as it ought to be
make[2]: *** [workspace/kwin/lib/CMakeFiles/kdecorations.dir/kcommondecoration.o] Error 1
make[1]: *** [workspace/kwin/lib/CMakeFiles/kdecorations.dir/all] Error 2


svn path=/branches/work/kwin_composite/; revision=640708

lib/kcommondecoration.h

@@ -238,7 +238,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
         virtual void iconChange();
         virtual void activeChange();
         virtual void captionChange();
-    public Q_SLOTS:
+    public slots:
         void keepAboveChange(bool above);
         void keepBelowChange(bool below);
         void slotMaximize();
@@ -258,8 +258,8 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
     private:
         void resetLayout();
 
-        void moveWidget(int x, int y, QWidget *widget) const;
-        void resizeWidget(int w, int h, QWidget *widget) const;
+        void moveWidget(int x, int y, QWidget *w) const;
+        void resizeWidget(int w, int h, QWidget *w) const;
 
         typedef QVector <KCommonDecorationButton*> ButtonContainer; ///< If the entry is 0, it's a spacer.
         int buttonContainerWidth(const ButtonContainer &btnContainer, bool countHidden = false) const;
@@ -287,9 +287,10 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration
  */
 class KWIN_EXPORT KCommonDecorationButton : public QAbstractButton
 {
+    Q_OBJECT
+
     friend class KCommonDecoration;
 
-        Q_OBJECT
     public:
         KCommonDecorationButton(ButtonType type, KCommonDecoration *parent);
         virtual ~KCommonDecorationButton();