-rw-r--r-- | libopie2/opiesecurity/multiauthcommon.cpp | 7 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthcommon.h | 13 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthconfigwidget.h | 20 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthmainwindow.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthmainwindow.h | 10 | ||||
-rw-r--r-- | libopie2/opiesecurity/multiauthplugininterface.h | 20 | ||||
-rw-r--r-- | libopie2/opiesecurity/opiesecurity.pro | 6 |
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 | |||
@@ -18,2 +18,4 @@ | |||
18 | 18 | ||
19 | namespace Opie { | ||
20 | namespace Security { | ||
19 | 21 | ||
@@ -55,2 +57,3 @@ void SecOwnerDlg::mousePressEvent( QMouseEvent * ) { accept(); } | |||
55 | 57 | ||
58 | namespace Internal { | ||
56 | /// run plugins until we reach nbSuccessMin successes | 59 | /// run plugins until we reach nbSuccessMin successes |
@@ -179 +182,5 @@ int runPlugins() { | |||
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 | |||
@@ -43,2 +43,6 @@ | |||
43 | 43 | ||
44 | |||
45 | namespace Opie { | ||
46 | namespace Security { | ||
47 | |||
44 | class SecOwnerDlg : public QDialog | 48 | class SecOwnerDlg : public QDialog |
@@ -57,5 +61,14 @@ class SecOwnerDlg : public QDialog | |||
57 | QTextView *tv; | 61 | QTextView *tv; |
62 | |||
63 | private: | ||
64 | struct Private; | ||
65 | Private *d; | ||
58 | }; | 66 | }; |
59 | 67 | ||
68 | namespace Internal { | ||
60 | int runPlugins(); | 69 | int runPlugins(); |
70 | } | ||
71 | |||
72 | } | ||
73 | } | ||
61 | 74 | ||
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 | |||
@@ -9,3 +9,3 @@ | |||
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 |
@@ -15,4 +15,4 @@ | |||
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; |
@@ -23,6 +23,6 @@ | |||
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, |
@@ -39,2 +39,5 @@ | |||
39 | 39 | ||
40 | namespace Opie { | ||
41 | namespace Security { | ||
42 | |||
40 | /// Base class of all Opie multiauth config widgets | 43 | /// Base class of all Opie multiauth config widgets |
@@ -65,4 +68,11 @@ class MultiauthConfigWidget : public QWidget { | |||
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 | |||
@@ -5,2 +5,5 @@ | |||
5 | 5 | ||
6 | namespace Opie { | ||
7 | namespace Security { | ||
8 | |||
6 | /// Initializes widgets according to allowBypass and explanScreens config | 9 | /// Initializes widgets according to allowBypass and explanScreens config |
@@ -77,3 +80,3 @@ MultiauthMainWindow::~MultiauthMainWindow() { | |||
77 | void MultiauthMainWindow::proceed() { | 80 | void MultiauthMainWindow::proceed() { |
78 | int result = runPlugins(); | 81 | int result = Internal::runPlugins(); |
79 | 82 | ||
@@ -129 +132,4 @@ bool MultiauthMainWindow::isAlreadyDone() { | |||
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 | |||
@@ -43,2 +43,6 @@ | |||
43 | 43 | ||
44 | |||
45 | namespace Opie { | ||
46 | namespace Security { | ||
47 | |||
44 | /// Multiauth main window | 48 | /// Multiauth main window |
@@ -70,4 +74,10 @@ class MultiauthMainWindow : public QDialog { | |||
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 |
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 | |||
@@ -3,3 +3,3 @@ | |||
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. |
@@ -11,3 +11,3 @@ | |||
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 |
@@ -17,4 +17,4 @@ | |||
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; |
@@ -25,6 +25,6 @@ | |||
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, |
@@ -45,2 +45,5 @@ class QWidget; | |||
45 | 45 | ||
46 | namespace Opie { | ||
47 | namespace Security { | ||
48 | |||
46 | #ifndef IID_MultiauthPluginInterface | 49 | #ifndef IID_MultiauthPluginInterface |
@@ -99,3 +102,3 @@ class MultiauthPluginObject { | |||
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. |
@@ -108,2 +111,5 @@ struct MultiauthPluginInterface : public QUnknownInterface { | |||
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 | |||
@@ -6,5 +6,7 @@ HEADERS = multiauthcommon.h \ | |||
6 | multiauthconfigwidget.h \ | 6 | multiauthconfigwidget.h \ |
7 | multiauthplugininterface.h | 7 | multiauthplugininterface.h \ |
8 | multiauthpassword.h | ||
8 | SOURCES = multiauthcommon.cpp \ | 9 | SOURCES = multiauthcommon.cpp \ |
9 | multiauthmainwindow.cpp | 10 | multiauthmainwindow.cpp \ |
11 | multiauthpassword.cpp | ||
10 | TARGET = opiesecurity2 | 12 | TARGET = opiesecurity2 |