-move OMAF into a namespace on its own

-add d'ptr were applicable

7 files changed, 69 insertions, 15 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
@@ -16,6 +16,8 @@
 #include <unistd.h>
 #include <qpe/config.h>
 
+namespace Opie {
+namespace Security {
 
 SecOwnerDlg::SecOwnerDlg( QWidget *parent, const char * name, Contact c,
                           bool modal, bool fullscreen = FALSE )
@@ -53,6 +55,7 @@ bool SecOwnerDlg::eventFilter(QObject *o, QEvent *e)
 void SecOwnerDlg::mousePressEvent( QMouseEvent * ) { accept(); }
 
 
+namespace Internal {
 /// run plugins until we reach nbSuccessMin successes
 int runPlugins() {
 
@@ -177,3 +180,7 @@ int runPlugins() {
     if(oi) delete oi;
     return 1;
 }
+
+}
+}
+}
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
@@ -41,6 +41,10 @@
 #include <qtextview.h>
 #include <qdialog.h>
 
+
+namespace Opie {
+namespace Security {
+
 class SecOwnerDlg : public QDialog
 {
     Q_OBJECT
@@ -55,8 +59,17 @@ class SecOwnerDlg : public QDialog
 
     private:
         QTextView *tv;
+        
+    private:
+        struct Private;
+        Private *d;
 };
 
+namespace Internal {
 int runPlugins();
+}
+
+}
+}
 
 #endif // MULTIAUTHCOMMON_H
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
@@ -7,24 +7,24 @@
                =.            This file is part of the Opie Project
              .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
            .>+-=
- _;:,     .>    :=|.         This library is free software; you can 
+ _;:,     .>    :=|.         This library is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.        
-    .i_,=:_.      -<s.       This library is distributed in the hope that  
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
- :     =  ...= . :.=-        
+ :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB. 
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
@@ -37,6 +37,9 @@
 #include <qwidget.h>
 #include <qobject.h>
 
+namespace Opie {
+namespace Security {
+
 /// Base class of all Opie multiauth config widgets
 /**
  * A base class for all Opie Multiauth Config Widgets.
@@ -63,6 +66,13 @@ class MultiauthConfigWidget : public QWidget {
          * Used when the config dialog is closed to write config stuff
          */
         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
@@ -3,6 +3,9 @@
 #include "multiauthcommon.h"
 #include <qpe/config.h>
 
+namespace Opie {
+namespace Security {
+
 /// Initializes widgets according to allowBypass and explanScreens config
 MultiauthMainWindow::MultiauthMainWindow()
     : QDialog(0, "main Opie multiauth modal dialog", TRUE,
@@ -75,7 +78,7 @@ MultiauthMainWindow::~MultiauthMainWindow() {
 
 /// launch the authentication
 void MultiauthMainWindow::proceed() {
-    int result = runPlugins();
+    int result = Internal::runPlugins();
 
 
     if ( (result == 0) && !explanScreens )
@@ -127,3 +130,6 @@ void MultiauthMainWindow::proceed() {
 bool MultiauthMainWindow::isAlreadyDone() {
     return alreadyDone;
 }
+
+}
+}
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
@@ -41,6 +41,10 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 
+
+namespace Opie {
+namespace Security {
+
 /// Multiauth main window
 /**
  * This QDialog window displays some information and an exit button,
@@ -68,7 +72,13 @@ class MultiauthMainWindow : public QDialog {
 
         private slots:
             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
@@ -1,7 +1,7 @@
 /**
  * \file multiauthplugininterface.h
  * \brief Main public interface to Opie multiauth authentication plugins.
- * 
+ *
  * This implementation was derived from the todolist plugin implementation.
  * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr)
  */
@@ -9,24 +9,24 @@
                =.            This file is part of the Opie Project
              .=l.            Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
            .>+-=
- _;:,     .>    :=|.         This library is free software; you can 
+ _;:,     .>    :=|.         This library is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.        
-    .i_,=:_.      -<s.       This library is distributed in the hope that  
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
- :     =  ...= . :.=-        
+ :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB. 
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
@@ -43,6 +43,9 @@
 class QString;
 class QWidget;
 
+namespace Opie {
+namespace Security {
+
 #ifndef IID_MultiauthPluginInterface
 /// Universally Unique Id of the interface (required by QCOM):
 /// {AD5BE8B1-8421-447b-9AED-250BE1CDA49c}
@@ -97,7 +100,7 @@ class MultiauthPluginObject {
 };
 
 /// Interface for multiauth plugin classes.
-/* 
+/*
  * This is part of the QCOM works. See example plugins how to do it right.
  * \see http://doc.trolltech.com/qtopia/html/pluginintro.html
  */
@@ -106,4 +109,7 @@ struct MultiauthPluginInterface : public QUnknownInterface {
     virtual MultiauthPluginObject *plugin() = 0;
 };
 
+}
+}
+
 #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
@@ -4,9 +4,11 @@ DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = multiauthcommon.h \
               multiauthmainwindow.h \
               multiauthconfigwidget.h \
-              multiauthplugininterface.h
+              multiauthplugininterface.h \
+              multiauthpassword.h
 SOURCES     = multiauthcommon.cpp \
-              multiauthmainwindow.cpp
+              multiauthmainwindow.cpp \
+              multiauthpassword.cpp
 TARGET      = opiesecurity2
 VERSION     = 0.0.2
 INCLUDEPATH += $(OPIEDIR)/include