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, 0 insertions, 5 deletions

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
@@ -122,3 +122,2 @@ void Security::show()
     } else {
-
                 if (!valid) // security passcode was not asked yet, so ask now
@@ -241,3 +240,2 @@ void Security::applySecurity()
     if ( valid ) {
-
         Config cfg("Security");
@@ -272,5 +270,2 @@ void Security::applySecurity()
 
-        cfg.setGroup("SyncMode");
-        cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
-
     }