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

5 files changed, 5 insertions, 17 deletions

diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp
index c15bb31..3141fb8 100644
--- a/core/settings/security/main.cpp
+++ b/core/settings/security/main.cpp
@@ -21,18 +21,12 @@
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 
 #include "security.h"
 
+#include <opie/oapplicationfactory.h>
 
-int main(int argc, char** argv)
-{
-    QPEApplication a(argc,argv);
+OPIE_EXPORT_APP( OApplicationFactory<Security> )
 
-    Security dlg;
 
-    a.showMainWidget(&dlg);
-
-    return a.exec();
-}
 
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 42a39c2..81363d2 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -117,13 +117,12 @@ void Security::show()
     if ( passcode.isEmpty() ) {
         // could insist...
         //changePassCode();
         //if ( passcode.isEmpty() )
         //reject();
     } else {
-
 		if (!valid) // security passcode was not asked yet, so ask now
 		{
 			QString pc = enterPassCode(tr("Enter passcode"));
 			if ( pc != passcode ) {
 				QMessageBox::critical(this, tr("Passcode incorrect"),
 						tr("The passcode entered is incorrect.\nAccess denied"));
@@ -236,13 +235,12 @@ void Security::setSyncNet(const QString& sn)
     selectNet(auth_peer,auth_peer_bits);
 }
 
 void Security::applySecurity()
 {
     if ( valid ) {
-
         Config cfg("Security");
         cfg.setGroup("Passcode");
         cfg.writeEntry("passcode",passcode);
         cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
         cfg.setGroup("Sync");
         int auth_peer=0;
@@ -267,15 +265,12 @@ void Security::applySecurity()
         if (autoLogin) {
             loginCfg.writeEntry("AutoLogin",autoLoginName);
         } else {
             loginCfg.removeEntry("AutoLogin");
         }
 
-	cfg.setGroup("SyncMode");
-	cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
-
     }
 }
 
 void Security::changeLoginName( int idx )
 {
     autoLoginName = userlist->text(idx);;
diff --git a/core/settings/security/security.h b/core/settings/security/security.h
index 2f18f91..52d56de 100644
--- a/core/settings/security/security.h
+++ b/core/settings/security/security.h
@@ -26,12 +26,13 @@ class QPEDialogListener;
 
 class Security : public SecurityBase
 { 
     Q_OBJECT
 
 public:
+    static QString appName() { return QString::fromLatin1("security"); }
     Security( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Security();
 
     void show();
 
 protected:
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index c359537..67995d4 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -1,9 +1,7 @@
-TEMPLATE	= app
-CONFIG		+= qt warn_on release
-DESTDIR		= $(OPIEDIR)/bin
+CONFIG		+= qt warn_on release quick-app
 HEADERS		= security.h
 SOURCES		= security.cpp main.cpp
 INTERFACES	= securitybase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= ../$(OPIEDIR)/include
 LIBS            += -lqpe
diff --git a/core/settings/security/securitybase.ui b/core/settings/security/securitybase.ui
index 73290e5..9fb63a8 100644
--- a/core/settings/security/securitybase.ui
+++ b/core/settings/security/securitybase.ui
@@ -8,13 +8,13 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>339</width>
+            <width>329</width>
             <height>483</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Security Settings</string>