6 files changed, 14 insertions, 7 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.
 /**
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)
 {
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
@@ -37,7 +37,7 @@
 
 #include <opie2/multiauthconfigwidget.h>
 
-class PinConfigWidget : public MultiauthConfigWidget {
+class PinConfigWidget : public Opie::Security::MultiauthConfigWidget {
 public:
     PinConfigWidget(QWidget* parent, const char* name);
     virtual ~PinConfigWidget();
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