Merging from old trunk:

r644597 | mueller | 2007-03-20 15:21:56 +0100 (Tue, 20 Mar 2007) | 2 lines

pedantic--


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

clients/b2/b2client.h

@@ -36,7 +36,7 @@ class B2Button : public Q3Button
 {
 public:
     B2Button(B2Client *_client=0, QWidget *parent=0, const QString& tip=NULL, const int realizeBtns = Qt::LeftButton);
-    ~B2Button() {};
+    ~B2Button() {}
 
     void setBg(const QColor &c){bg = c;}
     void setPixmaps(QPixmap *pix, QPixmap *pixDown, QPixmap *iPix,

clients/web/Web.h

@@ -73,8 +73,8 @@ namespace Web
 
     public:
 
-      WebFactory() {};
-      virtual ~WebFactory() {};
+      WebFactory() {}
+      virtual ~WebFactory() {}
       virtual KDecoration* createDecoration( KDecorationBridge* );
       virtual bool reset( unsigned long changed );
       virtual bool supports( Ability ability );

kcmkwin/kwindecoration/buttons.h

@@ -70,7 +70,7 @@ class ButtonDrag : public Q3StoredDrag
 {
 	public:
 		ButtonDrag( Button btn, QWidget* parent, const char* name=0 );
-		~ButtonDrag() {};
+		~ButtonDrag() {}
 
 		static bool canDecode( QDropEvent* e );
 		static bool decode( QDropEvent* e, Button& btn );

lib/kdecoration.h

@@ -175,7 +175,7 @@ class KDecorationProvides
     : public KDecorationDefines
     {
     public:
-        virtual  ~KDecorationProvides(){};
+        virtual  ~KDecorationProvides(){}
 		virtual bool provides( Requirement req ) = 0;
     };
 

lib/kdecoration_p.h

@@ -60,7 +60,7 @@ class KWIN_EXPORT KDecorationOptionsPrivate : public KDecorationDefines
 class KDecorationBridge : public KDecorationDefines
     {
     public:
-	virtual ~KDecorationBridge(){};
+	virtual ~KDecorationBridge(){}
 	virtual bool isActive() const = 0;
 	virtual bool isCloseable() const = 0;
 	virtual bool isMaximizable() const = 0;

utils.h

@@ -260,22 +260,22 @@ inline bool compositing() { return scene != NULL; }
 #define KWIN_CHECK_PREDICATE( name, cls, check ) \
 struct name \
     { \
-    inline bool operator()( const cls* cl ) { return check; }; \
+    inline bool operator()( const cls* cl ) { return check; } \
     }
 
 #define KWIN_COMPARE_PREDICATE( name, cls, type, check ) \
 struct name \
     { \
     typedef type type_helper; /* in order to work also with type being 'const Client*' etc. */ \
-    inline name( const type_helper& compare_value ) : value( compare_value ) {}; \
-    inline bool operator()( const cls* cl ) { return check; }; \
+    inline name( const type_helper& compare_value ) : value( compare_value ) {} \
+    inline bool operator()( const cls* cl ) { return check; } \
     const type_helper& value; \
     }
 
 #define KWIN_PROCEDURE( name, cls, action ) \
 struct name \
     { \
-    inline void operator()( cls* cl ) { action; }; \
+    inline void operator()( cls* cl ) { action; } \
     }
 
 KWIN_CHECK_PREDICATE( TruePredicate, Client, cl == cl /*true, avoid warning about 'cl' */ );