From 55ea6367fba8a82fbdca74599422717e4b3c3ec6 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Thu, 06 Nov 2003 10:17:45 +0000
Subject: 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 :(
---
(limited to 'core/settings/light-and-power/light.h')

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();
--
cgit v0.9.0.2