summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-17 16:42:51 (UTC)
committer zecke <zecke>2004-07-17 16:42:51 (UTC)
commit889c782a33abc8f5f15a0669c6d97688d22c304f (patch) (unidiff)
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) (ignore whitespace changes)
-rw-r--r--libopie2/opiesecurity/multiauthcommon.cpp7
-rw-r--r--libopie2/opiesecurity/multiauthcommon.h13
-rw-r--r--libopie2/opiesecurity/multiauthconfigwidget.h20
-rw-r--r--libopie2/opiesecurity/multiauthmainwindow.cpp8
-rw-r--r--libopie2/opiesecurity/multiauthmainwindow.h10
-rw-r--r--libopie2/opiesecurity/multiauthplugininterface.h20
-rw-r--r--libopie2/opiesecurity/opiesecurity.pro6
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
@@ -17,4 +17,6 @@
17#include <qpe/config.h> 17#include <qpe/config.h>
18 18
19namespace Opie {
20namespace Security {
19 21
20SecOwnerDlg::SecOwnerDlg( QWidget *parent, const char * name, Contact c, 22SecOwnerDlg::SecOwnerDlg( QWidget *parent, const char * name, Contact c,
@@ -54,4 +56,5 @@ void SecOwnerDlg::mousePressEvent( QMouseEvent * ) { accept(); }
54 56
55 57
58namespace Internal {
56/// run plugins until we reach nbSuccessMin successes 59/// run plugins until we reach nbSuccessMin successes
57int runPlugins() { 60int runPlugins() {
@@ -178,2 +181,6 @@ int runPlugins() {
178 return 1; 181 return 1;
179} 182}
183
184}
185}
186}
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 @@
42#include <qdialog.h> 42#include <qdialog.h>
43 43
44
45namespace Opie {
46namespace Security {
47
44class SecOwnerDlg : public QDialog 48class SecOwnerDlg : public QDialog
45{ 49{
@@ -56,7 +60,16 @@ class SecOwnerDlg : public QDialog
56 private: 60 private:
57 QTextView *tv; 61 QTextView *tv;
62
63 private:
64 struct Private;
65 Private *d;
58}; 66};
59 67
68namespace Internal {
60int runPlugins(); 69int runPlugins();
70}
71
72}
73}
61 74
62#endif // MULTIAUTHCOMMON_H 75#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
@@ -8,5 +8,5 @@
8 .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org> 8 .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
9 .>+-= 9 .>+-=
10 _;:, .> :=|. This library is free software; you can 10 _;:, .> :=|. This library is free software; you can
11.> <`_, > . <= redistribute it and/or modify it under 11.> <`_, > . <= redistribute it and/or modify it under
12:`=1 )Y*s>-.-- : the terms of the GNU Library General Public 12:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
@@ -14,6 +14,6 @@
14 - . .-<_> .<> Foundation; either version 2 of the License, 14 - . .-<_> .<> Foundation; either version 2 of the License,
15 ._= =} : or (at your option) any later version. 15 ._= =} : or (at your option) any later version.
16 .%`+i> _;_. 16 .%`+i> _;_.
17 .i_,=:_. -<s. This library is distributed in the hope that 17 .i_,=:_. -<s. This library is distributed in the hope that
18 + . -:. = it will be useful, but WITHOUT ANY WARRANTY; 18 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
19 : .. .:, . . . without even the implied warranty of 19 : .. .:, . . . without even the implied warranty of
@@ -22,8 +22,8 @@
22..}^=.= = ; Library General Public License for more 22..}^=.= = ; Library General Public License for more
23++= -. .` .: details. 23++= -. .` .: details.
24 : = ...= . :.=- 24 : = ...= . :.=-
25 -. .:....=;==+<; You should have received a copy of the GNU 25 -. .:....=;==+<; You should have received a copy of the GNU
26 -_. . . )=. = Library General Public License along with 26 -_. . . )=. = Library General Public License along with
27 -- :-=` this library; see the file COPYING.LIB. 27 -- :-=` this library; see the file COPYING.LIB.
28 If not, write to the Free Software Foundation, 28 If not, write to the Free Software Foundation,
29 Inc., 59 Temple Place - Suite 330, 29 Inc., 59 Temple Place - Suite 330,
@@ -38,4 +38,7 @@
38#include <qobject.h> 38#include <qobject.h>
39 39
40namespace Opie {
41namespace Security {
42
40/// Base class of all Opie multiauth config widgets 43/// Base class of all Opie multiauth config widgets
41/** 44/**
@@ -64,5 +67,12 @@ class MultiauthConfigWidget : public QWidget {
64 */ 67 */
65 virtual void writeConfig() = 0; 68 virtual void writeConfig() = 0;
69
70 private:
71 struct Private;
72 Private *d;
66}; 73};
67 74
75}
76}
77
68#endif // MULTIAUTHCONFIGWIDGET_H 78#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 @@
4#include <qpe/config.h> 4#include <qpe/config.h>
5 5
6namespace Opie {
7namespace Security {
8
6/// Initializes widgets according to allowBypass and explanScreens config 9/// Initializes widgets according to allowBypass and explanScreens config
7MultiauthMainWindow::MultiauthMainWindow() 10MultiauthMainWindow::MultiauthMainWindow()
@@ -76,5 +79,5 @@ MultiauthMainWindow::~MultiauthMainWindow() {
76/// launch the authentication 79/// launch the authentication
77void MultiauthMainWindow::proceed() { 80void MultiauthMainWindow::proceed() {
78 int result = runPlugins(); 81 int result = Internal::runPlugins();
79 82
80 83
@@ -128,2 +131,5 @@ bool MultiauthMainWindow::isAlreadyDone() {
128 return alreadyDone; 131 return alreadyDone;
129} 132}
133
134}
135}
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 @@
42#include <qlabel.h> 42#include <qlabel.h>
43 43
44
45namespace Opie {
46namespace Security {
47
44/// Multiauth main window 48/// Multiauth main window
45/** 49/**
@@ -69,6 +73,12 @@ class MultiauthMainWindow : public QDialog {
69 private slots: 73 private slots:
70 void proceed(); 74 void proceed();
75 private:
76 struct Private;
77 Private *d;
71}; 78};
72 79
80}
81}
82
73#endif // MULTIAUTHMAINWINDOW_H 83#endif // MULTIAUTHMAINWINDOW_H
74 84
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
@@ -2,5 +2,5 @@
2 * \file multiauthplugininterface.h 2 * \file multiauthplugininterface.h
3 * \brief Main public interface to Opie multiauth authentication plugins. 3 * \brief Main public interface to Opie multiauth authentication plugins.
4 * 4 *
5 * This implementation was derived from the todolist plugin implementation. 5 * This implementation was derived from the todolist plugin implementation.
6 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr) 6 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr)
@@ -10,5 +10,5 @@
10 .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org> 10 .=l. Copyright (C) 2004 Opie Developer Team <opie-devel@handhelds.org>
11 .>+-= 11 .>+-=
12 _;:, .> :=|. This library is free software; you can 12 _;:, .> :=|. This library is free software; you can
13.> <`_, > . <= redistribute it and/or modify it under 13.> <`_, > . <= redistribute it and/or modify it under
14:`=1 )Y*s>-.-- : the terms of the GNU Library General Public 14:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
@@ -16,6 +16,6 @@
16 - . .-<_> .<> Foundation; either version 2 of the License, 16 - . .-<_> .<> Foundation; either version 2 of the License,
17 ._= =} : or (at your option) any later version. 17 ._= =} : or (at your option) any later version.
18 .%`+i> _;_. 18 .%`+i> _;_.
19 .i_,=:_. -<s. This library is distributed in the hope that 19 .i_,=:_. -<s. This library is distributed in the hope that
20 + . -:. = it will be useful, but WITHOUT ANY WARRANTY; 20 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
21 : .. .:, . . . without even the implied warranty of 21 : .. .:, . . . without even the implied warranty of
@@ -24,8 +24,8 @@
24..}^=.= = ; Library General Public License for more 24..}^=.= = ; Library General Public License for more
25++= -. .` .: details. 25++= -. .` .: details.
26 : = ...= . :.=- 26 : = ...= . :.=-
27 -. .:....=;==+<; You should have received a copy of the GNU 27 -. .:....=;==+<; You should have received a copy of the GNU
28 -_. . . )=. = Library General Public License along with 28 -_. . . )=. = Library General Public License along with
29 -- :-=` this library; see the file COPYING.LIB. 29 -- :-=` this library; see the file COPYING.LIB.
30 If not, write to the Free Software Foundation, 30 If not, write to the Free Software Foundation,
31 Inc., 59 Temple Place - Suite 330, 31 Inc., 59 Temple Place - Suite 330,
@@ -44,4 +44,7 @@ class QString;
44class QWidget; 44class QWidget;
45 45
46namespace Opie {
47namespace Security {
48
46#ifndef IID_MultiauthPluginInterface 49#ifndef IID_MultiauthPluginInterface
47/// Universally Unique Id of the interface (required by QCOM): 50/// Universally Unique Id of the interface (required by QCOM):
@@ -98,5 +101,5 @@ class MultiauthPluginObject {
98 101
99/// Interface for multiauth plugin classes. 102/// Interface for multiauth plugin classes.
100/* 103/*
101 * This is part of the QCOM works. See example plugins how to do it right. 104 * This is part of the QCOM works. See example plugins how to do it right.
102 * \see http://doc.trolltech.com/qtopia/html/pluginintro.html 105 * \see http://doc.trolltech.com/qtopia/html/pluginintro.html
@@ -107,3 +110,6 @@ struct MultiauthPluginInterface : public QUnknownInterface {
107}; 110};
108 111
112}
113}
114
109#endif 115#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 \
5 multiauthmainwindow.h \ 5 multiauthmainwindow.h \
6 multiauthconfigwidget.h \ 6 multiauthconfigwidget.h \
7 multiauthplugininterface.h 7 multiauthplugininterface.h \
8 multiauthpassword.h
8SOURCES = multiauthcommon.cpp \ 9SOURCES = multiauthcommon.cpp \
9 multiauthmainwindow.cpp 10 multiauthmainwindow.cpp \
11 multiauthpassword.cpp
10TARGET = opiesecurity2 12TARGET = opiesecurity2
11VERSION = 0.0.2 13VERSION = 0.0.2