7 files changed, 57 insertions, 3 deletions

diff --git a/libopie2/opiesecurity/multiauthcommon.cpp b/libopie2/opiesecurity/multiauthcommon.cpp
index b72b9b1..d8e26d5 100644
--- a/libopie2/opiesecurity/multiauthcommon.cpp
+++ b/libopie2/opiesecurity/multiauthcommon.cpp
@@ -18,2 +18,4 @@
 
+namespace Opie {
+namespace Security {
 
@@ -55,2 +57,3 @@ void SecOwnerDlg::mousePressEvent( QMouseEvent * ) { accept(); }
 
+namespace Internal {
 /// run plugins until we reach nbSuccessMin successes
@@ -179 +182,5 @@ int runPlugins() {
 }
+
+}
+}
+}
diff --git a/libopie2/opiesecurity/multiauthcommon.h b/libopie2/opiesecurity/multiauthcommon.h
index 6d6d5d1..46beab0 100644
--- a/libopie2/opiesecurity/multiauthcommon.h
+++ b/libopie2/opiesecurity/multiauthcommon.h
@@ -43,2 +43,6 @@
 
+
+namespace Opie {
+namespace Security {
+
 class SecOwnerDlg : public QDialog
@@ -57,5 +61,14 @@ class SecOwnerDlg : public QDialog
         QTextView *tv;
+        
+    private:
+        struct Private;
+        Private *d;
 };
 
+namespace Internal {
 int runPlugins();
+}
+
+}
+}
 
diff --git a/libopie2/opiesecurity/multiauthconfigwidget.h b/libopie2/opiesecurity/multiauthconfigwidget.h
index cd6f047..2ed8fc0 100644
--- a/libopie2/opiesecurity/multiauthconfigwidget.h
+++ b/libopie2/opiesecurity/multiauthconfigwidget.h
@@ -39,2 +39,5 @@
 
+namespace Opie {
+namespace Security {
+
 /// Base class of all Opie multiauth config widgets
@@ -65,4 +68,11 @@ class MultiauthConfigWidget : public QWidget {
         virtual void  writeConfig() = 0;
+
+    private:
+        struct Private;
+        Private *d;
 };
 
+}
+}
+
 #endif // MULTIAUTHCONFIGWIDGET_H
diff --git a/libopie2/opiesecurity/multiauthmainwindow.cpp b/libopie2/opiesecurity/multiauthmainwindow.cpp
index 2be3473..c6229c7 100644
--- a/libopie2/opiesecurity/multiauthmainwindow.cpp
+++ b/libopie2/opiesecurity/multiauthmainwindow.cpp
@@ -5,2 +5,5 @@
 
+namespace Opie {
+namespace Security {
+
 /// Initializes widgets according to allowBypass and explanScreens config
@@ -77,3 +80,3 @@ MultiauthMainWindow::~MultiauthMainWindow() {
 void MultiauthMainWindow::proceed() {
-    int result = runPlugins();
+    int result = Internal::runPlugins();
 
@@ -129 +132,4 @@ bool MultiauthMainWindow::isAlreadyDone() {
 }
+
+}
+}
diff --git a/libopie2/opiesecurity/multiauthmainwindow.h b/libopie2/opiesecurity/multiauthmainwindow.h
index d5f53c6..626b8b3 100644
--- a/libopie2/opiesecurity/multiauthmainwindow.h
+++ b/libopie2/opiesecurity/multiauthmainwindow.h
@@ -43,2 +43,6 @@
 
+
+namespace Opie {
+namespace Security {
+
 /// Multiauth main window
@@ -70,4 +74,10 @@ class MultiauthMainWindow : public QDialog {
             void proceed();
+        private:
+            struct Private;
+            Private *d;
 };
 
+}
+}
+
 #endif // MULTIAUTHMAINWINDOW_H
diff --git a/libopie2/opiesecurity/multiauthplugininterface.h b/libopie2/opiesecurity/multiauthplugininterface.h
index 0035107..5998a18 100644
--- a/libopie2/opiesecurity/multiauthplugininterface.h
+++ b/libopie2/opiesecurity/multiauthplugininterface.h
@@ -45,2 +45,5 @@ class QWidget;
 
+namespace Opie {
+namespace Security {
+
 #ifndef IID_MultiauthPluginInterface
@@ -108,2 +111,5 @@ struct MultiauthPluginInterface : public QUnknownInterface {
 
+}
+}
+
 #endif
diff --git a/libopie2/opiesecurity/opiesecurity.pro b/libopie2/opiesecurity/opiesecurity.pro
index 8cb4821..8535785 100644
--- a/libopie2/opiesecurity/opiesecurity.pro
+++ b/libopie2/opiesecurity/opiesecurity.pro
@@ -6,5 +6,7 @@ HEADERS     = multiauthcommon.h \
               multiauthconfigwidget.h \
-              multiauthplugininterface.h
+              multiauthplugininterface.h \
+              multiauthpassword.h
 SOURCES     = multiauthcommon.cpp \
-              multiauthmainwindow.cpp
+              multiauthmainwindow.cpp \
+              multiauthpassword.cpp
 TARGET      = opiesecurity2