Addjust to the namespace changes of OMAF

20 files changed, 75 insertions, 51 deletions

diff --git a/noncore/securityplugins/blueping/bluepingplugin.cpp b/noncore/securityplugins/blueping/bluepingplugin.cpp
index af0448b..f4c5e95 100644
--- a/noncore/securityplugins/blueping/bluepingplugin.cpp
+++ b/noncore/securityplugins/blueping/bluepingplugin.cpp
@@ -13,4 +13,7 @@
 
 using namespace Opie::Core;
+using Opie::Security::MultiauthPluginObject;
+using Opie::Security::MultiauthConfigWidget;
+
 
 /// creates and initializes the m_config Config object
diff --git a/noncore/securityplugins/blueping/bluepingplugin.h b/noncore/securityplugins/blueping/bluepingplugin.h
index c122471..0df3f78 100644
--- a/noncore/securityplugins/blueping/bluepingplugin.h
+++ b/noncore/securityplugins/blueping/bluepingplugin.h
@@ -47,5 +47,5 @@
  * The plugin itself, implementing the main authenticate() function.
  */
-class BluepingPlugin : public QObject, public MultiauthPluginObject {
+class BluepingPlugin : public QObject, public Opie::Security::MultiauthPluginObject {
     
     Q_OBJECT
@@ -55,5 +55,5 @@ class BluepingPlugin : public QObject, public MultiauthPluginObject {
         virtual ~BluepingPlugin();
         int authenticate();
-        MultiauthConfigWidget * configWidget(QWidget * parent);
+        Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent);
         QString pixmapNameConfig() const;
         QString pixmapNameWidget() const;
diff --git a/noncore/securityplugins/blueping/bluepingpluginimpl.cpp b/noncore/securityplugins/blueping/bluepingpluginimpl.cpp
index f7b1bfc..dbca91f 100644
--- a/noncore/securityplugins/blueping/bluepingpluginimpl.cpp
+++ b/noncore/securityplugins/blueping/bluepingpluginimpl.cpp
@@ -1,4 +1,7 @@
 #include "bluepingpluginimpl.h"
 
+using Opie::Security::MultiauthPluginInterface;
+using Opie::Security::MultiauthPluginObject;
+
 BluepingPluginImpl::BluepingPluginImpl() {
     bluepingPlugin  = new BluepingPlugin();
diff --git a/noncore/securityplugins/blueping/bluepingpluginimpl.h b/noncore/securityplugins/blueping/bluepingpluginimpl.h
index 2fd023a..4663602 100644
--- a/noncore/securityplugins/blueping/bluepingpluginimpl.h
+++ b/noncore/securityplugins/blueping/bluepingpluginimpl.h
@@ -38,5 +38,5 @@
 
 /// Standard multiauth plugin class
-class BluepingPluginImpl : public MultiauthPluginInterface{
+class BluepingPluginImpl : public Opie::Security::MultiauthPluginInterface{
 
     public:
@@ -48,10 +48,9 @@ class BluepingPluginImpl : public MultiauthPluginInterface{
         Q_REFCOUNT;
 
-        virtual MultiauthPluginObject *plugin();
+        virtual Opie::Security::MultiauthPluginObject *plugin();
 
     private:
         /// the plugin itself
         BluepingPlugin *bluepingPlugin;
-        ulong ref;
 };
 
diff --git a/noncore/securityplugins/dummy/dummyplugin.cpp b/noncore/securityplugins/dummy/dummyplugin.cpp
index 0d19e43..594825e 100644
--- a/noncore/securityplugins/dummy/dummyplugin.cpp
+++ b/noncore/securityplugins/dummy/dummyplugin.cpp
@@ -8,4 +8,7 @@
 #include <qpushbutton.h>
 
+using Opie::Security::MultiauthConfigWidget;
+using Opie::Security::MultiauthPluginObject;
+
 /// Simply return its name (Dummy plugin)
 QString DummyPlugin::pluginName() const {
@@ -55,5 +58,5 @@ int DummyPlugin::authenticate() {
     QRect desk = oApp->desktop()->geometry();
     dummyDialog.setGeometry( 0, 0, desk.width(), desk.height() );
-    
+
     /* Creation of the particular widgets of our Dummy user interface
      * Note: we have to resize the VBox to the QDialog size, since it's not
@@ -64,5 +67,5 @@ int DummyPlugin::authenticate() {
     layout.setMargin(11);
     layout.setAlignment( Qt::AlignTop );
-    
+
     QLabel title("<center><h1>" + tr("\"Dummy\" <br />demonstration plugin") + "</h1></center>", &dummyDialog);
     QLabel subTitle("<center><h2>" +tr("You can simulate the following outcomes:") + "</h2></center>", &dummyDialog);
@@ -77,5 +80,5 @@ int DummyPlugin::authenticate() {
     hl.addWidget(&pbSkip, 0, Qt::AlignHCenter);
     hl.addWidget(&pbFailure, 0, Qt::AlignHCenter);
-    
+
     /* Linking our pushbuttons to exit functions
      * (each result button here has a corresponding slot)
@@ -84,5 +87,5 @@ int DummyPlugin::authenticate() {
     QObject::connect(&pbFailure, SIGNAL(clicked()), this, SLOT(failure()));
     QObject::connect(&pbSkip, SIGNAL(clicked()), this, SLOT(skip()));
-    
+
     /* The value of the signal these three slots will emit corresponds to
      * the different values we want to return
diff --git a/noncore/securityplugins/dummy/dummyplugin.h b/noncore/securityplugins/dummy/dummyplugin.h
index 9680dff..3bfca98 100644
--- a/noncore/securityplugins/dummy/dummyplugin.h
+++ b/noncore/securityplugins/dummy/dummyplugin.h
@@ -43,5 +43,5 @@
  * The plugin itself, implementing the main authenticate() function.
  */
-class DummyPlugin : public QObject, public MultiauthPluginObject {
+class DummyPlugin : public QObject, public Opie::Security::MultiauthPluginObject {
     
     Q_OBJECT
@@ -49,5 +49,5 @@ class DummyPlugin : 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/dummy/dummypluginimpl.cpp b/noncore/securityplugins/dummy/dummypluginimpl.cpp
index 518996c..54dbdd1 100644
--- a/noncore/securityplugins/dummy/dummypluginimpl.cpp
+++ b/noncore/securityplugins/dummy/dummypluginimpl.cpp
@@ -1,4 +1,7 @@
 #include "dummypluginimpl.h"
 
+using Opie::Security::MultiauthPluginInterface;
+using Opie::Security::MultiauthPluginObject;
+
 DummyPluginImpl::DummyPluginImpl() {
     dummyPlugin  = new DummyPlugin();
diff --git a/noncore/securityplugins/dummy/dummypluginimpl.h b/noncore/securityplugins/dummy/dummypluginimpl.h
index 49a18cd..ce8620d 100644
--- a/noncore/securityplugins/dummy/dummypluginimpl.h
+++ b/noncore/securityplugins/dummy/dummypluginimpl.h
@@ -38,5 +38,5 @@
 
 /// Standard multiauth plugin class
-class DummyPluginImpl : public MultiauthPluginInterface{
+class DummyPluginImpl : public Opie::Security::MultiauthPluginInterface{
 
     public:
@@ -48,10 +48,9 @@ class DummyPluginImpl : public MultiauthPluginInterface{
         Q_REFCOUNT;
 
-        virtual MultiauthPluginObject *plugin();
+        virtual Opie::Security::MultiauthPluginObject *plugin();
 
     private:
         /// the plugin itself
         DummyPlugin *dummyPlugin;
-        ulong ref;
 };
 
diff --git a/noncore/securityplugins/notice/noticeConfigWidget.cpp b/noncore/securityplugins/notice/noticeConfigWidget.cpp
index e2c2d83..e532232 100644
--- a/noncore/securityplugins/notice/noticeConfigWidget.cpp
+++ b/noncore/securityplugins/notice/noticeConfigWidget.cpp
@@ -9,4 +9,6 @@
 #include <qgroupbox.h>
 
+using Opie::Security::MultiauthConfigWidget;
+
 /// constructs the widget, filling the noticeMLE QMultiLineEdit with the "noticeText" entry
 NoticeConfigWidget::NoticeConfigWidget(QWidget* parent = 0, const char* name = "Notice configuration widget") : MultiauthConfigWidget(parent, name)
@@ -47,5 +49,5 @@ NoticeConfigWidget::~NoticeConfigWidget()
 void NoticeConfigWidget::writeConfig()
 {
-    if ( noticeMLE->edited() ) { 
+    if ( noticeMLE->edited() ) {
         odebug << "writing new notice text in Security.conf" << oendl;
         setNoticeText(noticeMLE->text());
diff --git a/noncore/securityplugins/notice/noticeConfigWidget.h b/noncore/securityplugins/notice/noticeConfigWidget.h
index 69f15bf..c90484c 100644
--- a/noncore/securityplugins/notice/noticeConfigWidget.h
+++ b/noncore/securityplugins/notice/noticeConfigWidget.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,
@@ -49,6 +49,6 @@ static char defaultNoticeText [] = "<h2>NOTICE TO USERS</h2>\n"
         "this system you indicate your awareness of and consent to these "
         "terms. LOG OFF IMMEDIATELY if you do not agree to them.</em></strong></p>";
-        
-class NoticeConfigWidget : public MultiauthConfigWidget {
+
+class NoticeConfigWidget : public Opie::Security::MultiauthConfigWidget {
 
     Q_OBJECT
@@ -70,2 +70,3 @@ private:
 
 #endif // NOTICECONFIGWIDGET_H
+
diff --git a/noncore/securityplugins/notice/noticeplugin.cpp b/noncore/securityplugins/notice/noticeplugin.cpp
index bacc439..25a452a 100644
--- a/noncore/securityplugins/notice/noticeplugin.cpp
+++ b/noncore/securityplugins/notice/noticeplugin.cpp
@@ -6,4 +6,6 @@
 #include <qregexp.h>
 
+using Opie::Security::MultiauthPluginObject;
+using Opie::Security::MultiauthConfigWidget;
 
 /// creates and initializes the m_config Config object
@@ -62,8 +64,8 @@ int NoticePlugin::authenticate() {
 
     noticeDialog.setButtonText(QMessageBox::Yes, tr("I accept"));
-    
+
     QRect desk = oApp->desktop()->geometry();
     noticeDialog.setGeometry( 0, 0, desk.width(), desk.height() );
-    
+
     switch (noticeDialog.exec())
     {
diff --git a/noncore/securityplugins/notice/noticeplugin.h b/noncore/securityplugins/notice/noticeplugin.h
index 842d47b..4aa6f02 100644
--- a/noncore/securityplugins/notice/noticeplugin.h
+++ b/noncore/securityplugins/notice/noticeplugin.h
@@ -44,5 +44,5 @@
  * The plugin itself, implementing the main authenticate() function.
  */
-class NoticePlugin : public QObject, public MultiauthPluginObject {
+class NoticePlugin : public QObject, public Opie::Security::MultiauthPluginObject {
 
     Q_OBJECT;
@@ -52,5 +52,5 @@ public:
     virtual ~NoticePlugin();
     int authenticate();
-    MultiauthConfigWidget * configWidget(QWidget * parent);
+    Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent);
     QString pixmapNameConfig() const;
     QString pixmapNameWidget() const;
diff --git a/noncore/securityplugins/notice/noticepluginimpl.cpp b/noncore/securityplugins/notice/noticepluginimpl.cpp
index 34e3cfc..7524512 100644
--- a/noncore/securityplugins/notice/noticepluginimpl.cpp
+++ b/noncore/securityplugins/notice/noticepluginimpl.cpp
@@ -1,4 +1,7 @@
 #include "noticepluginimpl.h"
 
+using Opie::Security::MultiauthPluginObject;
+using Opie::Security::MultiauthPluginInterface;
+
 NoticePluginImpl::NoticePluginImpl() {
     noticePlugin  = new NoticePlugin();
diff --git a/noncore/securityplugins/notice/noticepluginimpl.h b/noncore/securityplugins/notice/noticepluginimpl.h
index b2a1140..1b1e22f 100644
--- a/noncore/securityplugins/notice/noticepluginimpl.h
+++ b/noncore/securityplugins/notice/noticepluginimpl.h
@@ -40,5 +40,5 @@
  * \brief Standard multiauth plugin class
  */
-class NoticePluginImpl : public MultiauthPluginInterface{
+class NoticePluginImpl : public Opie::Security::MultiauthPluginInterface{
 
     public:
@@ -50,10 +50,9 @@ class NoticePluginImpl : public MultiauthPluginInterface{
         Q_REFCOUNT;
 
-        virtual MultiauthPluginObject *plugin();
+        virtual Opie::Security::MultiauthPluginObject *plugin();
 
     private:
         /// the plugin itself
         NoticePlugin *noticePlugin;
-        ulong ref;
 };
 
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;
 };