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 :(

3 files changed, 6 insertions, 13 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
@@ -36,7 +36,7 @@ class CityTime : public CityTimeBase
 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 );
diff --git a/core/settings/citytime/citytime.pro b/core/settings/citytime/citytime.pro
index c7f4d08..402bcf6 100644
--- a/core/settings/citytime/citytime.pro
+++ b/core/settings/citytime/citytime.pro
@@ -1,14 +1,12 @@
-CONFIG += qt warn_on release
-TEMPLATE = app
-DESTDIR         = $(OPIEDIR)/bin
-#INTERFACES = citytimebase.ui
+CONFIG += qt warn_on release quick-app
 HEADERS = citytime.h citytimebase.h zonemap.h sun.h stylusnormalizer.h
 SOURCES = citytime.cpp citytimebase.cpp zonemap.cpp main.cpp sun.c stylusnormalizer.cpp
-TARGET = citytime
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe
 
+TARGET	= citytime
+
 TRANSLATIONS = ../../../i18n/de/citytime.ts \
 	 ../../../i18n/nl/citytime.ts \
 	 ../../../i18n/xx/citytime.ts \
diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp
index e8664c6..69bfe44 100644
--- a/core/settings/citytime/main.cpp
+++ b/core/settings/citytime/main.cpp
@@ -20,11 +20,6 @@
 
 #include "citytime.h"
 #include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char** argv )
-{
-    QPEApplication a( argc, argv );
-    CityTime main;
-    a.showMainWidget( &main );
-    return a.exec();
-}
+OPIE_EXPORT_APP( OApplicationFactory<CityTime> )