unbreak compilation (gcc 3.4+)

svn path=/trunk/kdebase/kcontrol/; revision=239225

client.cpp

@@ -109,7 +109,7 @@ public:
     QCString windowRole;
 };
 
-};
+}
 
 // put all externs before the namespace statement to allow the linker
 // to resolve them properly

client.h

@@ -527,6 +527,6 @@ public:
     void setShade( bool , int ){}
 };
 
-};
+}
 
 #endif

clients/b2/b2client.cpp

@@ -142,7 +142,7 @@ B2Button::B2Button(Client *_client, QWidget *parent, const QString& tip)
     client = _client;
     useMiniIcon = false;
     setFixedSize(16,16); 
-};
+}
 
 
 QSize B2Button::sizeHint() const
@@ -958,7 +958,7 @@ void B2Client::positionButtons()
     titlebar->move(bar_x_ofs, 0);
 }
 
-};
+}
 
 extern "C"
 {

clients/b2/b2client.h

@@ -126,6 +126,6 @@ private:
     int in_unobs;
 };
 
-};
+}
 
 #endif

clients/default/kdedefault.cpp

@@ -1100,7 +1100,7 @@ void KDEDefaultClient::menuButtonReleased()
 		closeWindow();
 }
 
-};
+}
 
 // Extended KWin plugin interface
 extern "C"

clients/default/kdedefault.h

@@ -117,7 +117,7 @@ class KDEDefaultClient : public Client
 		bool m_closing;
 };
 
-};
+}
 
 #endif
 // vim: ts=4

clients/keramik/keramik.cpp

@@ -1457,7 +1457,7 @@ Client::MousePosition KeramikClient::mousePosition( const QPoint &p ) const
 	return Nowhere;
 }
 
-}; // namespace Keramik
+} // namespace Keramik
 
 
 

clients/kwmtheme/kwmthemeclient.cpp

@@ -799,7 +799,7 @@ void KWMThemeClient::init()
     //
 }
 
-};
+}
 
 extern "C"
 {

clients/kwmtheme/kwmthemeclient.h

@@ -54,7 +54,7 @@ private:
     QGridLayout* layout;
 };
 
-};
+}
 
 #endif
 

clients/laptop/laptopclient.cpp

@@ -683,7 +683,7 @@ LaptopClient::mousePosition( const QPoint& p ) const
   return m;
 }
 
-};
+}
 
 extern "C"
 {

clients/laptop/laptopclient.h

@@ -82,6 +82,6 @@ private:
     int lastBufferWidth;
 };
 
-};
+}
 
 #endif

clients/modernsystem/modernsys.cpp

@@ -615,7 +615,7 @@ Client::MousePosition ModernSys::mousePosition( const QPoint& p) const
     return m;
 }
 
-};
+}
 
 // KWin extended plugin interface
 extern "C"

clients/modernsystem/modernsys.h

@@ -68,6 +68,6 @@ private:
     QString oldTitle;
 };
 
-};
+}
 
 #endif

clients/quartz/quartz.cpp

@@ -798,7 +798,7 @@ void QuartzClient::menuButtonPressed()
 	button[BtnMenu]->setDown(false);
 }
 
-};
+}
 
 // Extended KWin plugin interface
 /////////////////////////////////

clients/quartz/quartz.h

@@ -112,7 +112,7 @@ class QuartzClient : public Client
 		QSpacerItem*  titlebar;
 };
 
-};
+}
 
 #endif
 // vim: ts=4

clients/redmond/redmond.cpp

@@ -784,7 +784,7 @@ void GalliumClient::menuButtonReleased()
 	closeWindow();
 }
 
-};
+}
 
 extern "C"
 {

clients/redmond/redmond.h

@@ -98,7 +98,7 @@ class GalliumClient : public Client
 		bool           closing;
 };
 
-};
+}
 
 #endif
 // vim: ts=4

clients/web/Web.cpp

@@ -511,7 +511,7 @@ WebClient::animateIconifyOrDeiconify(bool /* iconify */)
   // Nice and simple ;)
 }
 
-};
+}
 
 #include "Web.moc"
 // vim:ts=2:sw=2:tw=78:set et:

clients/web/WebButton.cpp

@@ -252,7 +252,7 @@ WebButton::resizeEvent(QResizeEvent *)
   repaint();
 }
 
-};
+}
 
 #include "WebButton.moc"
 // vim:ts=2:sw=2:tw=78:set et:

clients/web/WebButtonClose.cpp

@@ -44,7 +44,7 @@ WebButtonClose::clickEvent(int /* button */)
   emit(closeWindow());
 }
 
-};
+}
 
 #include "WebButtonClose.moc"
 // vim:ts=2:sw=2:tw=78:set et:

clients/web/WebButtonHelp.cpp

@@ -45,7 +45,7 @@ WebButtonHelp::clickEvent(int /* button */)
   emit(help());
 }
 
-};
+}
 
 #include "WebButtonHelp.moc"
 // vim:ts=2:sw=2:tw=78:set et:

clients/web/WebButtonIconify.cpp

@@ -44,7 +44,7 @@ WebButtonIconify::clickEvent(int /* button */)
   emit(iconify());
 }
 
-};
+}
 
 #include "WebButtonIconify.moc"
 // vim:ts=2:sw=2:tw=78:set et:

clients/web/WebButtonLower.cpp

@@ -44,7 +44,7 @@ WebButtonLower::clickEvent(int /* button */)
   emit(lowerWindow());
 }
 
-};
+}
 
 #include "WebButtonLower.moc"
 // vim:ts=2:sw=2:tw=78:set et:

clients/web/WebButtonMaximize.cpp

@@ -58,7 +58,7 @@ WebButtonMaximize::clickEvent(int button)
   emit(maximize(button));
 }
 
-};
+}
 
 #include "WebButtonMaximize.moc"
 // vim:ts=2:sw=2:tw=78:set et:

clients/web/WebButtonSticky.cpp

@@ -58,7 +58,7 @@ WebButtonSticky::clickEvent(int /* button */)
   emit(toggleSticky());
 }
 
-};
+}
 
 #include "WebButtonSticky.moc"
 // vim:ts=2:sw=2:tw=78:set et:

geometrytip.h

@@ -25,6 +25,6 @@ class GeometryTip: public QLabel
 	const Client* c;
 };
 
-};
+}
 
 #endif

kcmkwin/kwindecoration/buttons.cpp

@@ -137,7 +137,7 @@ ButtonSource::ButtonSource( QWidget* parent, const char* name )
 
 	spacerCount = 0;	// No spacers inserted yet
 	setAcceptDrops( TRUE );
-};
+}
 
 
 ButtonSource::~ButtonSource()

kcmkwin/kwindecoration/kwindecoration.cpp

@@ -43,7 +43,7 @@
 // KCModule plugin interface
 // =========================
 typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") );
+K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
 
 KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, const QStringList &)
        : DCOPObject("KWinClientDecoration"), KCModule(KWinDecoFactory::instance(), parent, name),

killwindow.h

@@ -23,6 +23,6 @@ private:
     Workspace* workspace;
 };
 
-};
+}
 
 #endif

kwinbutton.h

@@ -112,7 +112,7 @@ class KWinWidgetButton: public QWidget
 };
 
 
-};
+}
 
 #endif
 // vim: ts=4

main.cpp

@@ -39,7 +39,7 @@ using namespace KWinInternal;
 
 namespace KWinInternal {
 Options* options;
-};
+}
 
 Atoms* atoms;
 

options.cpp

@@ -33,7 +33,7 @@ public:
     int electric_border_delay;
     bool show_geometry_tip;
 };
-};
+}
 
 #define colors (d->colors)
 #define cg (d->cg)

options.h

@@ -364,6 +364,6 @@ private:
 
 extern Options* options;
 
-}; // namespace
+} // namespace
 
 #endif

placement.cpp

@@ -35,7 +35,7 @@ public:
     Workspace* m_WorkspacePtr;
 };
 
-};
+}
 
 Placement::Placement(Workspace* w)
 {

placement.h

@@ -43,6 +43,6 @@ private:
 
 };
 
-};
+}
 
 #endif

plugins.h

@@ -40,6 +40,6 @@ protected:
     QCString defaultPlugin;
 };
 
-};
+}
 
 #endif

popupinfo.h

@@ -38,6 +38,6 @@ private:
     QString m_infoString;
 };
 
-};
+}
 
 #endif

tabbox.h

@@ -82,6 +82,6 @@ inline TabBox::Mode TabBox::mode() const
     return m;
 }
 
-};
+}
 
 #endif

workspace.cpp

@@ -135,7 +135,7 @@ public:
     QRect* workarea; //  array of workareas for virtual desktops
 };
 
-};
+}
 
 using namespace KWinInternal;
 
@@ -3009,10 +3009,10 @@ void Workspace::slotGrabWindow()
 		QMemArray<QRect> maskedAwayRects = maskedAway.rects();
 
 		//Fill the masked away area with black.
-		QPainter p(&p);
+		QPainter pt(&p);
 		for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
-		    p.fillRect(maskedAwayRects[pos], Qt::black);
-		p.end();
+		    pt.fillRect(maskedAwayRects[pos], Qt::black);
+		pt.end();
 	    }
 	}
 

workspace.h

@@ -522,6 +522,6 @@ inline void Workspace::showWindowMenu(QPoint pos, Client* cl)
 }
 
 
-};
+}
 
 #endif