merge core/settings/*

- light-and-power and security were a bit ugly, so I recommend someone
  who actually dealt with these files looking into if I got it right
  (not to tell about the frustratation about the fact that the ones who
  dealt with these files didn't do the merge in the first place :(

1 files changed, 2 insertions, 1 deletions

diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h
index d41a209..67694d3 100644
--- a/core/settings/button/buttonsettings.h
+++ b/core/settings/button/buttonsettings.h
@@ -44,5 +44,6 @@ class ButtonSettings : public QDialog {
 public:
-        ButtonSettings ( );
+        ButtonSettings ( QWidget *parent = 0, const char *name = 0,  bool modal = FALSE,WFlags f = 0 );
         ~ButtonSettings ( );
 
+        static QString appName() { return QString::fromLatin1("buttonsettings"); }
         virtual void accept ( );