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

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> )