summaryrefslogtreecommitdiff
path: root/core/settings/security/security.cpp
Side-by-side diff
Diffstat (limited to 'core/settings/security/security.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/security.cpp58
1 files changed, 32 insertions, 26 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 4eddb55..b917aea 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -20,4 +20,5 @@
#include "security.h"
+/* OPIE */
#include <qpe/qpeapplication.h>
#include <qpe/config.h>
@@ -25,5 +26,7 @@
#include <qpe/qpedialog.h>
#include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
+/* QT */
#include <qcheckbox.h>
#include <qpushbutton.h>
@@ -33,4 +36,7 @@
#include <qtextstream.h>
+
+using namespace Opie::Core;
+
Security::Security( QWidget* parent, const char* name, WFlags fl )
: SecurityBase( parent, name, TRUE, WStyle_ContextHelp )
@@ -119,5 +125,5 @@ void Security::restoreDefaults()
QMessageBox unrecbox(
tr("Attention"),
- tr( "<p>All user-defined net ranges will be lost."),
+ tr( "<p>All user-defined net ranges will be lost."),
QMessageBox::Warning,
QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
@@ -171,14 +177,14 @@ void Security::show()
//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"));
- reject();
- return;
- }
- }
+ 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"));
+ reject();
+ return;
+ }
+ }
}
setEnabled(TRUE);
@@ -217,15 +223,15 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
//insert user-defined list of netranges upon start
if (update) {
- //User selected/active netrange first
- syncnet->insertItem( tr( sn ) );
+ //User selected/active netrange first
+ syncnet->insertItem( tr( sn ) );
- Config cfg("Security");
- cfg.setGroup("Sync");
+ Config cfg("Security");
+ cfg.setGroup("Sync");
- //set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe
- QString test = cfg.readEntry("net0","");
- if (test.isEmpty()) {
+ //set up defaults if needed, if someone manually deletes net0 he'll get a suprise hehe
+ QString test = cfg.readEntry("net0","");
+ if (test.isEmpty()) {
insertDefaultRanges();
- } else {
+ } else {
// 10 ought to be enough for everybody... :)
// If you need more, don't forget to edit applySecurity() as well
@@ -258,5 +264,5 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
}
}
- qDebug("No match for \"%s\"",sn.latin1());
+ odebug << "No match for \"" << sn << "\"" << oendl;
}
@@ -341,10 +347,10 @@ void Security::applySecurity()
cfg.writeEntry("auth_peer_bits",auth_peer_bits);
- //write back all other net ranges in *cleartext*
- for (int i=0; i<10; i++) {
- QString target;
- target.sprintf("net%d", i);
- cfg.writeEntry(target,syncnet->text(i));
- }
+ //write back all other net ranges in *cleartext*
+ for (int i=0; i<10; i++) {
+ QString target;
+ target.sprintf("net%d", i);
+ cfg.writeEntry(target,syncnet->text(i));
+ }
#ifdef ODP