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, 1 insertions, 0 deletions

diff --git a/core/settings/light-and-power/light.h b/core/settings/light-and-power/light.h
index c48e5f6..83d5520 100644
--- a/core/settings/light-and-power/light.h
+++ b/core/settings/light-and-power/light.h
@@ -42,6 +42,7 @@ class LightSettings : public LightSettingsBase
 public:
     LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~LightSettings();
+    static QString appName() { return QString::fromLatin1("light-and-power"); }
 
 protected:
     virtual void accept();