author | zecke <zecke> | 2004-07-17 16:42:51 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-17 16:42:51 (UTC) |
commit | 889c782a33abc8f5f15a0669c6d97688d22c304f (patch) (side-by-side diff) | |
tree | b3c3a24b763152049cce8f9e01f53597404e623f /libopie2/opiesecurity | |
parent | cff9ca4211a9b3ab3669957c9c3e991732f8cfb3 (diff) | |
download | opie-889c782a33abc8f5f15a0669c6d97688d22c304f.zip opie-889c782a33abc8f5f15a0669c6d97688d22c304f.tar.gz opie-889c782a33abc8f5f15a0669c6d97688d22c304f.tar.bz2 |
-move OMAF into a namespace on its own
-add d'ptr were applicable
-rw-r--r-- | libopie2/opiesecurity/multiauthcommon.cpp | 7 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthcommon.h | 13 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthconfigwidget.h | 10 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthmainwindow.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthmainwindow.h | 10 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthplugininterface.h | 6 | ||||
-rw-r--r-- | libopie2/opiesecurity/opiesecurity.pro | 6 |
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 @@ -17,4 +17,6 @@ #include <qpe/config.h> +namespace Opie { +namespace Security { SecOwnerDlg::SecOwnerDlg( QWidget *parent, const char * name, Contact c, @@ -54,4 +56,5 @@ void SecOwnerDlg::mousePressEvent( QMouseEvent * ) { accept(); } +namespace Internal { /// run plugins until we reach nbSuccessMin successes int runPlugins() { @@ -178,2 +181,6 @@ int runPlugins() { 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 @@ -42,4 +42,8 @@ #include <qdialog.h> + +namespace Opie { +namespace Security { + class SecOwnerDlg : public QDialog { @@ -56,7 +60,16 @@ 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 @@ -38,4 +38,7 @@ #include <qobject.h> +namespace Opie { +namespace Security { + /// Base class of all Opie multiauth config widgets /** @@ -64,5 +67,12 @@ 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 @@ -4,4 +4,7 @@ #include <qpe/config.h> +namespace Opie { +namespace Security { + /// Initializes widgets according to allowBypass and explanScreens config MultiauthMainWindow::MultiauthMainWindow() @@ -76,5 +79,5 @@ MultiauthMainWindow::~MultiauthMainWindow() { /// launch the authentication void MultiauthMainWindow::proceed() { - int result = runPlugins(); + int result = Internal::runPlugins(); @@ -128,2 +131,5 @@ 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 @@ -42,4 +42,8 @@ #include <qlabel.h> + +namespace Opie { +namespace Security { + /// Multiauth main window /** @@ -69,6 +73,12 @@ 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 @@ -44,4 +44,7 @@ class QString; class QWidget; +namespace Opie { +namespace Security { + #ifndef IID_MultiauthPluginInterface /// Universally Unique Id of the interface (required by QCOM): @@ -107,3 +110,6 @@ 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 @@ -5,7 +5,9 @@ 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 |