summaryrefslogtreecommitdiff
path: root/core/settings/security
Side-by-side diff
Diffstat (limited to 'core/settings/security') (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/main.cpp10
-rw-r--r--core/settings/security/security.cpp5
-rw-r--r--core/settings/security/security.h1
-rw-r--r--core/settings/security/security.pro4
-rw-r--r--core/settings/security/securitybase.ui2
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
@@ -23,16 +23,10 @@
#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
@@ -119,9 +119,8 @@ void Security::show()
//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 ) {
@@ -238,9 +237,8 @@ void Security::setSyncNet(const QString& sn)
void Security::applySecurity()
{
if ( valid ) {
-
Config cfg("Security");
cfg.setGroup("Passcode");
cfg.writeEntry("passcode",passcode);
cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
@@ -269,11 +267,8 @@ void Security::applySecurity()
} else {
loginCfg.removeEntry("AutoLogin");
}
- cfg.setGroup("SyncMode");
- cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
-
}
}
void Security::changeLoginName( int 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
@@ -28,8 +28,9 @@ 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();
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,7 +1,5 @@
-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
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
@@ -10,9 +10,9 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>339</width>
+ <width>329</width>
<height>483</height>
</rect>
</property>
<property stdset="1">