Addjust to the namespace changes of OMAF

4 files changed, 10 insertions, 5 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
@@ -9,12 +9,15 @@
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qtimer.h>
 
 using namespace Opie::Core;
+using Opie::Security::MultiauthPluginObject;
+using Opie::Security::MultiauthConfigWidget;
+
 
 /// creates and initializes the m_config Config object
 BluepingPlugin::BluepingPlugin() : MultiauthPluginObject(), m_ping(0) {
     m_config = new Config("Security");
     m_config->setGroup("BluepingPlugin");
     bluetoothAlreadyRestarted = false;
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
@@ -43,21 +43,21 @@
 #include <qpe/config.h>
 
 /// Multi-authentication bluetooth plugin, which tries to ping a specific MAC address.
 /**
  * The plugin itself, implementing the main authenticate() function.
  */
-class BluepingPlugin : public QObject, public MultiauthPluginObject {
+class BluepingPlugin : public QObject, public Opie::Security::MultiauthPluginObject {
     
     Q_OBJECT
     
     public:
         BluepingPlugin();
         virtual ~BluepingPlugin();
         int authenticate();
-        MultiauthConfigWidget * configWidget(QWidget * parent);
+        Opie::Security::MultiauthConfigWidget * configWidget(QWidget * parent);
         QString pixmapNameConfig() const;
         QString pixmapNameWidget() const;
         QString pluginName() const;
         
     signals:
         /// Signal carrying the result code of this plugin
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,8 +1,11 @@
 #include "bluepingpluginimpl.h"
 
+using Opie::Security::MultiauthPluginInterface;
+using Opie::Security::MultiauthPluginObject;
+
 BluepingPluginImpl::BluepingPluginImpl() {
     bluepingPlugin  = new BluepingPlugin();
 }
 
 BluepingPluginImpl::~BluepingPluginImpl() {
     delete 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
@@ -34,25 +34,24 @@
 #ifndef BLUEPING_PLUGIN_IMPL_H
 #define BLUEPING_PLUGIN_IMPL_H
 
 #include "bluepingplugin.h"
 
 /// Standard multiauth plugin class
-class BluepingPluginImpl : public MultiauthPluginInterface{
+class BluepingPluginImpl : public Opie::Security::MultiauthPluginInterface{
 
     public:
         BluepingPluginImpl();
         virtual ~BluepingPluginImpl();
 
         QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
         /// defines standard addRef() and release() functions
         Q_REFCOUNT;
 
-        virtual MultiauthPluginObject *plugin();
+        virtual Opie::Security::MultiauthPluginObject *plugin();
 
     private:
         /// the plugin itself
         BluepingPlugin *bluepingPlugin;
-        ulong ref;
 };
 
 #endif