summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-17 16:42:51 (UTC)
committer zecke <zecke>2004-07-17 16:42:51 (UTC)
commit889c782a33abc8f5f15a0669c6d97688d22c304f (patch) (side-by-side diff)
treeb3c3a24b763152049cce8f9e01f53597404e623f
parentcff9ca4211a9b3ab3669957c9c3e991732f8cfb3 (diff)
downloadopie-889c782a33abc8f5f15a0669c6d97688d22c304f.zip
opie-889c782a33abc8f5f15a0669c6d97688d22c304f.tar.gz
opie-889c782a33abc8f5f15a0669c6d97688d22c304f.tar.bz2
-move OMAF into a namespace on its own
-add d'ptr were applicable
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiesecurity/multiauthcommon.cpp7
-rw-r--r--libopie2/opiesecurity/multiauthcommon.h13
-rw-r--r--libopie2/opiesecurity/multiauthconfigwidget.h10
-rw-r--r--libopie2/opiesecurity/multiauthmainwindow.cpp8
-rw-r--r--libopie2/opiesecurity/multiauthmainwindow.h10
-rw-r--r--libopie2/opiesecurity/multiauthplugininterface.h6
-rw-r--r--libopie2/opiesecurity/opiesecurity.pro6
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
@@ -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
@@ -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
@@ -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}
@@ -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