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
@@ -43,4 +43,7 @@ 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;
 
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
@@ -45,3 +45,3 @@
  */
-class PinPlugin : public QObject, public MultiauthPluginObject {
+class PinPlugin : public QObject, public Opie::Security::MultiauthPluginObject {
 
@@ -51,3 +51,3 @@ public:
     int authenticate();
-    MultiauthConfigWidget * configWidget(QWidget * parent);
+    Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent);
     QString pixmapNameConfig() 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
@@ -7,2 +7,4 @@
 
+using Opie::Security::MultiauthConfigWidget;
+
 PinConfigWidget::PinConfigWidget(QWidget* parent = 0, const char* name = "PIN configuration widget")
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
@@ -39,3 +39,3 @@
 
-class PinConfigWidget : public MultiauthConfigWidget {
+class PinConfigWidget : public Opie::Security::MultiauthConfigWidget {
 public:
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
@@ -2,2 +2,5 @@
 
+using Opie::Security::MultiauthPluginObject;
+using Opie::Security::MultiauthPluginInterface;
+
 PinPluginImpl::PinPluginImpl() {
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
@@ -39,3 +39,3 @@
 /// Standard multiauth plugin class
-class PinPluginImpl : public MultiauthPluginInterface{
+class PinPluginImpl : public Opie::Security::MultiauthPluginInterface{
 
@@ -49,3 +49,3 @@ class PinPluginImpl : public MultiauthPluginInterface{
 
-        virtual MultiauthPluginObject *plugin();
+        virtual Opie::Security::MultiauthPluginObject *plugin();
 
@@ -54,3 +54,2 @@ class PinPluginImpl : public MultiauthPluginInterface{
         PinPlugin *pinPlugin;
-        ulong ref;
 };