Addjust to the namespace changes of OMAF

6 files changed, 13 insertions, 6 deletions

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
@@ -8,6 +8,8 @@
 #include <qregexp.h>
 #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)
 {
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
@@ -49,7 +49,7 @@ 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
 
@@ -69,3 +69,4 @@ 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
@@ -5,6 +5,8 @@
 #include <qmessagebox.h>
 #include <qregexp.h>
 
+using Opie::Security::MultiauthPluginObject;
+using Opie::Security::MultiauthConfigWidget;
 
 /// creates and initializes the m_config Config object
 NoticePlugin::NoticePlugin() : MultiauthPluginObject(), noticeW(0) {
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
@@ -43,7 +43,7 @@
 /** 
  * The plugin itself, implementing the main authenticate() function.
  */
-class NoticePlugin : public QObject, public MultiauthPluginObject {
+class NoticePlugin : public QObject, public Opie::Security::MultiauthPluginObject {
 
     Q_OBJECT;
 
@@ -51,7 +51,7 @@ public:
     NoticePlugin();
     virtual ~NoticePlugin();
     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/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,5 +1,8 @@
 #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
@@ -39,7 +39,7 @@
 /**
  * \brief Standard multiauth plugin class
  */
-class NoticePluginImpl : public MultiauthPluginInterface{
+class NoticePluginImpl : public Opie::Security::MultiauthPluginInterface{
 
     public:
         NoticePluginImpl();
@@ -49,12 +49,11 @@ class NoticePluginImpl : public MultiauthPluginInterface{
         /// defines standard addRef() and release() functions
         Q_REFCOUNT;
 
-        virtual MultiauthPluginObject *plugin();
+        virtual Opie::Security::MultiauthPluginObject *plugin();
 
     private:
         /// the plugin itself
         NoticePlugin *noticePlugin;
-        ulong ref;
 };
 
 #endif