Addjust to the namespace changes of OMAF

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
@@ -41,8 +41,11 @@
 
 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.
 /**
@@ -232,10 +235,10 @@ 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())
             return "";
@@ -302,13 +305,13 @@ int PinPlugin::authenticate()
         PinDlg pd(0,0,TRUE,TRUE);
         pd.reset();
         pd.exec();
-        
+
         // analyse the result
         if (isSkip == TRUE)
             return MultiauthPluginObject::Skip;
         else if (verify(pd.pinD->text, hashedPin))
             return MultiauthPluginObject::Success;
-        else 
+        else
             return MultiauthPluginObject::Failure;
     }
     owarn << "No PIN has been defined! We consider it as a successful authentication though." << oendl;
@@ -331,10 +334,10 @@ QString PinPlugin::pixmapNameConfig() const {
 /// returns a PinConfigWidget
 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
@@ -43,13 +43,13 @@
 /** 
  * The plugin itself, implementing the main authenticate() function.
  */
-class PinPlugin : public QObject, public MultiauthPluginObject {
+class PinPlugin : public QObject, public Opie::Security::MultiauthPluginObject {
 
     Q_OBJECT
     
 public:
     int authenticate();
-    MultiauthConfigWidget * configWidget(QWidget * parent);
+    Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent);
     QString pixmapNameConfig() const;
     QString pixmapNameWidget() const;
     QString pluginName() 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
@@ -5,6 +5,8 @@
 
 #include "pinConfigWidget.h"
 
+using Opie::Security::MultiauthConfigWidget;
+
 PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN configuration widget")
     : MultiauthConfigWidget(parent, name)
 {
@@ -12,7 +14,7 @@ PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN co
     baseLayout->setSpacing(11);
     baseLayout->setMargin(11);
     baseLayout->setAlignment( Qt::AlignTop );
-    
+
     QGroupBox * configBox = new QGroupBox(0, Qt::Vertical, tr("Configure your PIN here"), this);
     baseLayout->addWidget(configBox);
     QVBoxLayout *boxLayout = new QVBoxLayout( configBox->layout() );
@@ -27,7 +29,7 @@ PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN co
     buttonLayout->addWidget(changePIN);
     buttonLayout->addWidget(clearPIN);
     boxLayout->addLayout(buttonLayout);
-    
+
 }
 
 /// nothing to do
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
@@ -7,24 +7,24 @@
                =.            This file is part of the Opie Project
              .=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
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         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
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      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,
                              Boston, MA 02111-1307, USA.
@@ -37,15 +37,15 @@
 
 #include <opie2/multiauthconfigwidget.h>
 
-class PinConfigWidget : public MultiauthConfigWidget {
+class PinConfigWidget : public Opie::Security::MultiauthConfigWidget {
 public:
     PinConfigWidget(QWidget* parent, const char* name);
     virtual ~PinConfigWidget();
     virtual void writeConfig();
 ///\todo to protect?
     QPushButton *changePIN;
-    QPushButton *clearPIN; 
-    
+    QPushButton *clearPIN;
+
 };
 
 #endif // PINCONFIGWIDGET_H
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,5 +1,8 @@
 #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
@@ -37,7 +37,7 @@
 #include "pin.h"
 
 /// Standard multiauth plugin class
-class PinPluginImpl : public MultiauthPluginInterface{
+class PinPluginImpl : public Opie::Security::MultiauthPluginInterface{
 
     public:
         PinPluginImpl();
@@ -47,12 +47,11 @@ class PinPluginImpl : public MultiauthPluginInterface{
         // defines standard addRef() and release() functions
         Q_REFCOUNT;
 
-        virtual MultiauthPluginObject *plugin();
+        virtual Opie::Security::MultiauthPluginObject *plugin();
 
     private:
         /// the plugin itself
         PinPlugin *pinPlugin;
-        ulong ref;
 };
 
 #endif