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

diff --git a/core/settings/citytime/citytime.h b/core/settings/citytime/citytime.h
index 63e3102..cc3d487 100644
--- a/core/settings/citytime/citytime.h
+++ b/core/settings/citytime/citytime.h
@@ -27,25 +27,25 @@
 #include "citytimebase.h"
 
 const int CITIES = 6;    // the number of cities...
 
 class ZoneMap;
 
 class CityTime : public CityTimeBase
 {
     Q_OBJECT
 public:
     CityTime(QWidget* parent = 0, const char *name = 0, WFlags fl = 0);
     ~CityTime();
-
+    static QString appName() { return QString::fromLatin1("citytime"); }
 public slots:
     void beginNewTz();
     void slotNewTz( const QString& strNewCountry, const QString& strNewCity );
     void changeClock( bool newClock );
 
 protected:
     void timerEvent( QTimerEvent* );
     void mousePressEvent( QMouseEvent* event );
 
 private:
     void showTime( void );  // get and show the time for various places...
     void readInTimes( void );   // a method to get information from the config