author | zecke <zecke> | 2004-07-17 16:46:58 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-17 16:46:58 (UTC) |
commit | e917f3763a0beb6d540adbfa5f59e478d3baec64 (patch) (side-by-side diff) | |
tree | c2cf3f13559d9693a4f66cd3f65e419b571377bd /noncore/securityplugins/pin | |
parent | d6a4bf47ef7dfaabd08fb8d514cde1832a055816 (diff) | |
download | opie-e917f3763a0beb6d540adbfa5f59e478d3baec64.zip opie-e917f3763a0beb6d540adbfa5f59e478d3baec64.tar.gz opie-e917f3763a0beb6d540adbfa5f59e478d3baec64.tar.bz2 |
Addjust to the namespace changes of OMAF
-rw-r--r-- | noncore/securityplugins/pin/pin.cpp | 17 | ||||
-rw-r--r-- | noncore/securityplugins/pin/pin.h | 4 | ||||
-rw-r--r-- | noncore/securityplugins/pin/pinConfigWidget.cpp | 6 | ||||
-rw-r--r-- | noncore/securityplugins/pin/pinConfigWidget.h | 16 | ||||
-rw-r--r-- | noncore/securityplugins/pin/pinpluginimpl.cpp | 3 | ||||
-rw-r--r-- | noncore/securityplugins/pin/pinpluginimpl.h | 5 |
6 files changed, 29 insertions, 22 deletions
diff --git a/noncore/securityplugins/pin/pin.cpp b/noncore/securityplugins/pin/pin.cpp index 37dc5be..c21ffcd 100644 --- a/noncore/securityplugins/pin/pin.cpp +++ b/noncore/securityplugins/pin/pin.cpp @@ -42,6 +42,9 @@ extern "C" char *crypt(const char *key, const char *salt); +using Opie::Security::MultiauthConfigWidget; +using Opie::Security::MultiauthPluginObject; + /// set to TRUE when we press the 'Skip' button -bool isSkip = FALSE; +static bool isSkip = FALSE; /// PIN input graphical widget. @@ -233,8 +236,8 @@ QString PinPlugin::getPIN( const QString& prompt ) PinDlg pd(0,0,TRUE); pd.pinD->setPrompt( prompt ); - + pd.showMaximized(); int r = pd.exec(); - + if ( r == QDialog::Accepted ) { if (pd.pinD->text.isEmpty()) @@ -303,5 +306,5 @@ int PinPlugin::authenticate() pd.reset(); pd.exec(); - + // analyse the result if (isSkip == TRUE) @@ -309,5 +312,5 @@ int PinPlugin::authenticate() else if (verify(pd.pinD->text, hashedPin)) return MultiauthPluginObject::Success; - else + else return MultiauthPluginObject::Failure; } @@ -332,8 +335,8 @@ QString PinPlugin::pixmapNameConfig() const { MultiauthConfigWidget * PinPlugin::configWidget(QWidget * parent) { PinConfigWidget * pinw = new PinConfigWidget(parent, "PIN configuration widget"); - + connect(pinw->changePIN, SIGNAL( clicked() ), this, SLOT( changePIN() )); connect(pinw->clearPIN, SIGNAL( clicked() ), this, SLOT( clearPIN() )); - + return pinw; } diff --git a/noncore/securityplugins/pin/pin.h b/noncore/securityplugins/pin/pin.h index 6cd328a..1832210 100644 --- a/noncore/securityplugins/pin/pin.h +++ b/noncore/securityplugins/pin/pin.h @@ -44,5 +44,5 @@ * The plugin itself, implementing the main authenticate() function. */ -class PinPlugin : public QObject, public MultiauthPluginObject { +class PinPlugin : public QObject, public Opie::Security::MultiauthPluginObject { Q_OBJECT @@ -50,5 +50,5 @@ class PinPlugin : public QObject, public MultiauthPluginObject { public: int authenticate(); - MultiauthConfigWidget * configWidget(QWidget * parent); + Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent); QString pixmapNameConfig() const; QString pixmapNameWidget() const; diff --git a/noncore/securityplugins/pin/pinConfigWidget.cpp b/noncore/securityplugins/pin/pinConfigWidget.cpp index 53e1a20..b34db8b 100644 --- a/noncore/securityplugins/pin/pinConfigWidget.cpp +++ b/noncore/securityplugins/pin/pinConfigWidget.cpp @@ -6,4 +6,6 @@ #include "pinConfigWidget.h" +using Opie::Security::MultiauthConfigWidget; + PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN configuration widget") : MultiauthConfigWidget(parent, name) @@ -13,5 +15,5 @@ PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN co baseLayout->setMargin(11); baseLayout->setAlignment( Qt::AlignTop ); - + QGroupBox * configBox = new QGroupBox(0, Qt::Vertical, tr("Configure your PIN here"), this); baseLayout->addWidget(configBox); @@ -28,5 +30,5 @@ PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN co buttonLayout->addWidget(clearPIN); boxLayout->addLayout(buttonLayout); - + } diff --git a/noncore/securityplugins/pin/pinConfigWidget.h b/noncore/securityplugins/pin/pinConfigWidget.h index 3242ad0..6d5edff 100644 --- a/noncore/securityplugins/pin/pinConfigWidget.h +++ b/noncore/securityplugins/pin/pinConfigWidget.h @@ -8,5 +8,5 @@ .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org> .>+-= - _;:, .> :=|. This library is free software; you can + _;:, .> :=|. This library is free software; you can .> <`_, > . <= redistribute it and/or modify it under :`=1 )Y*s>-.-- : the terms of the GNU Library General Public @@ -14,6 +14,6 @@ - . .-<_> .<> Foundation; either version 2 of the License, ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This library is distributed in the hope that + .%`+i> _;_. + .i_,=:_. -<s. This library is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of @@ -22,8 +22,8 @@ ..}^=.= = ; Library General Public License for more ++= -. .` .: details. - : = ...= . :.=- + : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with - -- :-=` this library; see the file COPYING.LIB. + -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -38,5 +38,5 @@ #include <opie2/multiauthconfigwidget.h> -class PinConfigWidget : public MultiauthConfigWidget { +class PinConfigWidget : public Opie::Security::MultiauthConfigWidget { public: PinConfigWidget(QWidget* parent, const char* name); @@ -45,6 +45,6 @@ public: ///\todo to protect? QPushButton *changePIN; - QPushButton *clearPIN; - + QPushButton *clearPIN; + }; diff --git a/noncore/securityplugins/pin/pinpluginimpl.cpp b/noncore/securityplugins/pin/pinpluginimpl.cpp index 1c32f81..6cd2467 100644 --- a/noncore/securityplugins/pin/pinpluginimpl.cpp +++ b/noncore/securityplugins/pin/pinpluginimpl.cpp @@ -1,4 +1,7 @@ #include "pinpluginimpl.h" +using Opie::Security::MultiauthPluginObject; +using Opie::Security::MultiauthPluginInterface; + PinPluginImpl::PinPluginImpl() { pinPlugin = new PinPlugin(); diff --git a/noncore/securityplugins/pin/pinpluginimpl.h b/noncore/securityplugins/pin/pinpluginimpl.h index e604b64..cbb9ef0 100644 --- a/noncore/securityplugins/pin/pinpluginimpl.h +++ b/noncore/securityplugins/pin/pinpluginimpl.h @@ -38,5 +38,5 @@ /// Standard multiauth plugin class -class PinPluginImpl : public MultiauthPluginInterface{ +class PinPluginImpl : public Opie::Security::MultiauthPluginInterface{ public: @@ -48,10 +48,9 @@ class PinPluginImpl : public MultiauthPluginInterface{ Q_REFCOUNT; - virtual MultiauthPluginObject *plugin(); + virtual Opie::Security::MultiauthPluginObject *plugin(); private: /// the plugin itself PinPlugin *pinPlugin; - ulong ref; }; |