summaryrefslogtreecommitdiff
authorclem <clem>2004-10-06 23:53:23 (UTC)
committer clem <clem>2004-10-06 23:53:23 (UTC)
commitd2256c288998704c0b43986865c884070b983d89 (patch) (unidiff)
tree2b0eaa9be7109a8629955fb4c2d670f162f465ec
parent5137abdac1d6990c038170a2b3533ae85eecb7f1 (diff)
downloadopie-d2256c288998704c0b43986865c884070b983d89.zip
opie-d2256c288998704c0b43986865c884070b983d89.tar.gz
opie-d2256c288998704c0b43986865c884070b983d89.tar.bz2
fixed file name in doxygen comment!
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/osmartpointer.h2
-rw-r--r--libopie2/opiesecurity/multiauthpassword.cpp2
-rw-r--r--libopie2/opiesecurity/multiauthpassword.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/libopie2/opiecore/osmartpointer.h b/libopie2/opiecore/osmartpointer.h
index c7dc9d9..e9cee0c 100644
--- a/libopie2/opiecore/osmartpointer.h
+++ b/libopie2/opiecore/osmartpointer.h
@@ -1,149 +1,149 @@
1// -*- Mode: C++; -*- 1// -*- Mode: C++; -*-
2/* 2/*
3 This file is part of the Opie Project 3 This file is part of the Opie Project
4 Copyright (C) 2004 Rajko Albrecht <alwin@handhelds.org> 4 Copyright (C) 2004 Rajko Albrecht <alwin@handhelds.org>
5 Copyright (C) The Opie Team <opie-devel@handhelds.org> 5 Copyright (C) The Opie Team <opie-devel@handhelds.org>
6 =. 6 =.
7 .=l. 7 .=l.
8 .>+-= 8 .>+-=
9_;:, .> :=|. This program is free software; you can 9_;:, .> :=|. This program is free software; you can
10.> <`_, > . <= redistribute it and/or modify it under 10.> <`_, > . <= redistribute it and/or modify it under
11:`=1 )Y*s>-.-- : the terms of the GNU Library General Public 11:`=1 )Y*s>-.-- : the terms of the GNU Library General Public
12.="- .-=="i, .._ License as published by the Free Software 12.="- .-=="i, .._ License as published by the Free Software
13- . .-<_> .<> Foundation; either version 2 of the License, 13- . .-<_> .<> Foundation; either version 2 of the License,
14 ._= =} : or (at your option) any later version. 14 ._= =} : or (at your option) any later version.
15 .%`+i> _;_. 15 .%`+i> _;_.
16 .i_,=:_. -<s. This program is distributed in the hope that 16 .i_,=:_. -<s. This program is distributed in the hope that
17 + . -:. = it will be useful, but WITHOUT ANY WARRANTY; 17 + . -:. = it will be useful, but WITHOUT ANY WARRANTY;
18 : .. .:, . . . without even the implied warranty of 18 : .. .:, . . . without even the implied warranty of
19 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A 19 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
20 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU 20 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
21..}^=.= = ; Library General Public License for more 21..}^=.= = ; Library General Public License for more
22++= -. .` .: details. 22++= -. .` .: details.
23: = ...= . :.=- 23: = ...= . :.=-
24-. .:....=;==+<; You should have received a copy of the GNU 24-. .:....=;==+<; You should have received a copy of the GNU
25 -_. . . )=. = Library General Public License along with 25 -_. . . )=. = Library General Public License along with
26 -- :-=` this library; see the file COPYING.LIB. 26 -- :-=` this library; see the file COPYING.LIB.
27 If not, write to the Free Software Foundation, 27 If not, write to the Free Software Foundation,
28 Inc., 59 Temple Place - Suite 330, 28 Inc., 59 Temple Place - Suite 330,
29 Boston, MA 02111-1307, USA. 29 Boston, MA 02111-1307, USA.
30*/ 30*/
31 31
32#ifndef _OSmartPointer_h 32#ifndef _OSmartPointer_h
33#define _OSmartPointer_h 33#define _OSmartPointer_h
34 34
35#include <stddef.h> 35#include <stddef.h>
36 36
37/*! 37/*!
38 * \file OSmartPointer.h 38 * \file osmartpointer.h
39 * \brief smart pointer and reference counter 39 * \brief smart pointer and reference counter
40 * \author Rajko Albrecht 40 * \author Rajko Albrecht
41 * 41 *
42 */ 42 */
43 43
44namespace Opie { 44namespace Opie {
45namespace Core { 45namespace Core {
46 46
47//! simple reference counter class 47//! simple reference counter class
48class ORefCount { 48class ORefCount {
49protected: 49protected:
50 //! reference count member 50 //! reference count member
51 long m_RefCount; 51 long m_RefCount;
52public: 52public:
53 //! first reference must be added after "new" via Pointer() 53 //! first reference must be added after "new" via Pointer()
54 ORefCount() : m_RefCount(0) 54 ORefCount() : m_RefCount(0)
55 {} 55 {}
56 virtual ~ORefCount() {} 56 virtual ~ORefCount() {}
57 //! add a reference 57 //! add a reference
58 void Incr() { 58 void Incr() {
59 ++m_RefCount; 59 ++m_RefCount;
60 } 60 }
61 //! delete a reference 61 //! delete a reference
62 void Decr() { 62 void Decr() {
63 --m_RefCount; 63 --m_RefCount;
64 } 64 }
65 //! is it referenced 65 //! is it referenced
66 bool Shared() { return (m_RefCount > 0); } 66 bool Shared() { return (m_RefCount > 0); }
67}; 67};
68 68
69//! reference counting wrapper class 69//! reference counting wrapper class
70template<class T> class OSmartPointer { 70template<class T> class OSmartPointer {
71 //! pointer to object 71 //! pointer to object
72 /*! 72 /*!
73 * this object must contain Incr(), Decr() and Shared() 73 * this object must contain Incr(), Decr() and Shared()
74 * methode as public members. The best way is, that it will be a child 74 * methode as public members. The best way is, that it will be a child
75 * class of RefCount 75 * class of RefCount
76 */ 76 */
77 T *ptr; 77 T *ptr;
78public: 78public:
79 //! standart constructor 79 //! standart constructor
80 OSmartPointer() { ptr = NULL; } 80 OSmartPointer() { ptr = NULL; }
81 //! standart destructor 81 //! standart destructor
82 /*! 82 /*!
83 * release the reference, if it were the last reference, destroys 83 * release the reference, if it were the last reference, destroys
84 * ptr 84 * ptr
85 */ 85 */
86 ~OSmartPointer() 86 ~OSmartPointer()
87 { 87 {
88 if (ptr){ 88 if (ptr){
89 ptr->Decr(); 89 ptr->Decr();
90 if (!ptr->Shared()) 90 if (!ptr->Shared())
91 delete ptr; 91 delete ptr;
92 } 92 }
93 } 93 }
94 //! construction 94 //! construction
95 OSmartPointer(T* t) { if (ptr = t) ptr->Incr(); } 95 OSmartPointer(T* t) { if (ptr = t) ptr->Incr(); }
96 //! Pointer copy 96 //! Pointer copy
97 OSmartPointer(const OSmartPointer<T>& p) 97 OSmartPointer(const OSmartPointer<T>& p)
98 { if (ptr = p.ptr) ptr->Incr(); } 98 { if (ptr = p.ptr) ptr->Incr(); }
99 //! pointer copy by assignment 99 //! pointer copy by assignment
100 OSmartPointer<T>& operator= (const OSmartPointer<T>& p) 100 OSmartPointer<T>& operator= (const OSmartPointer<T>& p)
101 { 101 {
102 // already same: nothing to do 102 // already same: nothing to do
103 if (ptr == p.ptr) return *this; 103 if (ptr == p.ptr) return *this;
104 // decouple reference 104 // decouple reference
105 if (ptr) { ptr->Decr(); if (!ptr->Shared()) delete ptr; } 105 if (ptr) { ptr->Decr(); if (!ptr->Shared()) delete ptr; }
106 // establish new reference 106 // establish new reference
107 if (ptr = p.ptr) ptr->Incr(); 107 if (ptr = p.ptr) ptr->Incr();
108 return *this; 108 return *this;
109 } 109 }
110 OSmartPointer<T>& operator= (T*p) 110 OSmartPointer<T>& operator= (T*p)
111 { 111 {
112 if (ptr==p)return *this; 112 if (ptr==p)return *this;
113 if (ptr) { 113 if (ptr) {
114 ptr->Decr(); 114 ptr->Decr();
115 if (!ptr->Shared()) delete ptr; 115 if (!ptr->Shared()) delete ptr;
116 } 116 }
117 if (ptr=p) ptr->Incr(); 117 if (ptr=p) ptr->Incr();
118 return *this; 118 return *this;
119 } 119 }
120 120
121 //! cast to conventional pointer 121 //! cast to conventional pointer
122 operator T* () const { return ptr; } 122 operator T* () const { return ptr; }
123 123
124 //! deref: fails for NULL pointer 124 //! deref: fails for NULL pointer
125 T& operator* () {return *ptr; } 125 T& operator* () {return *ptr; }
126 //! deref: fails for NULL pointer 126 //! deref: fails for NULL pointer
127 const T& operator* ()const {return *ptr; } 127 const T& operator* ()const {return *ptr; }
128 128
129 //! deref with method call 129 //! deref with method call
130 T* operator-> () {return ptr; } 130 T* operator-> () {return ptr; }
131 //! deref with const method call 131 //! deref with const method call
132 const T* operator-> ()const {return ptr; } 132 const T* operator-> ()const {return ptr; }
133 133
134 //! supports "if (pointer)" 134 //! supports "if (pointer)"
135 operator bool () const { return (ptr != NULL); } 135 operator bool () const { return (ptr != NULL); }
136 //! "if (pointer)" as non const 136 //! "if (pointer)" as non const
137 operator bool () { return ptr != NULL;} 137 operator bool () { return ptr != NULL;}
138 138
139 //! support if (!pointer)" 139 //! support if (!pointer)"
140 bool operator! () const { return (ptr == NULL); } 140 bool operator! () const { return (ptr == NULL); }
141 //! support if (!pointer)" as non const 141 //! support if (!pointer)" as non const
142 bool operator! () { return (ptr == NULL); } 142 bool operator! () { return (ptr == NULL); }
143}; 143};
144 144
145} 145}
146} 146}
147 147
148#endif 148#endif
149 149
diff --git a/libopie2/opiesecurity/multiauthpassword.cpp b/libopie2/opiesecurity/multiauthpassword.cpp
index b9c8a39..b793717 100644
--- a/libopie2/opiesecurity/multiauthpassword.cpp
+++ b/libopie2/opiesecurity/multiauthpassword.cpp
@@ -1,106 +1,106 @@
1/** 1/**
2 * \file multiauthpassord.cpp 2 * \file multiauthpassword.cpp
3 * \brief Password Dialog dropin. 3 * \brief Password Dialog dropin.
4 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr) 4 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr)
5 */ 5 */
6/* 6/*
7 =. This file is part of the Opie Project 7 =. This file is part of the Opie Project
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
13.="- .-=="i, .._ License as published by the Free Software 13.="- .-=="i, .._ License as published by the Free Software
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
20 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A 20 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
21 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU 21 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
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,
30 Boston, MA 02111-1307, USA. 30 Boston, MA 02111-1307, USA.
31 31
32*/ 32*/
33 33
34 34
35/* OPIE */ 35/* OPIE */
36#include <opie2/multiauthcommon.h> 36#include <opie2/multiauthcommon.h>
37#include <opie2/multiauthmainwindow.h> 37#include <opie2/multiauthmainwindow.h>
38#include <qpe/config.h> 38#include <qpe/config.h>
39#include <qpe/qlibrary.h> 39#include <qpe/qlibrary.h>
40#include <qpe/qcom.h> 40#include <qpe/qcom.h>
41 41
42/* QT */ 42/* QT */
43#include <qapplication.h> 43#include <qapplication.h>
44#include <qvbox.h> 44#include <qvbox.h>
45#include <qpushbutton.h> 45#include <qpushbutton.h>
46#include <qlabel.h> 46#include <qlabel.h>
47#include <qdir.h> 47#include <qdir.h>
48 48
49#include "multiauthpassword.h" 49#include "multiauthpassword.h"
50 50
51namespace Opie { 51namespace Opie {
52namespace Security { 52namespace Security {
53 53
54 54
55/** 55/**
56 * If the users requires authentication... #fixme 56 * If the users requires authentication... #fixme
57 * 57 *
58 * @todo fix up at_poweron attribute 58 * @todo fix up at_poweron attribute
59 */ 59 */
60bool MultiauthPassword::needToAuthenticate(bool at_poweron) 60bool MultiauthPassword::needToAuthenticate(bool at_poweron)
61{ 61{
62 Config cfg("Security"); 62 Config cfg("Security");
63 cfg.setGroup("Misc"); 63 cfg.setGroup("Misc");
64 if ( !at_poweron && cfg.readBoolEntry("onStart", false) ) 64 if ( !at_poweron && cfg.readBoolEntry("onStart", false) )
65 return true; 65 return true;
66 else if ( at_poweron && cfg.readBoolEntry("onResume", false) ) 66 else if ( at_poweron && cfg.readBoolEntry("onResume", false) )
67 return true; 67 return true;
68 else 68 else
69 return false; 69 return false;
70} 70}
71 71
72 72
73/** 73/**
74 * \brief Require user authentication to unlock and continue 74 * \brief Require user authentication to unlock and continue
75 * 75 *
76 * This method will check if you require authentication 76 * This method will check if you require authentication
77 * and then will lock the screen and require a succesfull 77 * and then will lock the screen and require a succesfull
78 * authentication. 78 * authentication.
79 * Authenticate may enter the event loop and only returns 79 * Authenticate may enter the event loop and only returns
80 * if the user sucesfully authenticated to the system. 80 * if the user sucesfully authenticated to the system.
81 * 81 *
82 * @return only if succesfully authenticated 82 * @return only if succesfully authenticated
83 */ 83 */
84void MultiauthPassword::authenticate(bool at_poweron) 84void MultiauthPassword::authenticate(bool at_poweron)
85{ 85{
86 if ( ! needToAuthenticate(at_poweron) ) 86 if ( ! needToAuthenticate(at_poweron) )
87 return; 87 return;
88 88
89 /* Constructs the main window, which displays messages and blocks 89 /* Constructs the main window, which displays messages and blocks
90 * access to the desktop 90 * access to the desktop
91 */ 91 */
92 MultiauthMainWindow win; 92 MultiauthMainWindow win;
93 93
94 // resize the QDialog object so it fills all the screen 94 // resize the QDialog object so it fills all the screen
95 QRect desk = qApp->desktop()->geometry(); 95 QRect desk = qApp->desktop()->geometry();
96 win.setGeometry( 0, 0, desk.width(), desk.height() ); 96 win.setGeometry( 0, 0, desk.width(), desk.height() );
97 97
98 // the authentication has already succeeded (without win interactions) 98 // the authentication has already succeeded (without win interactions)
99 if ( win.isAlreadyDone() ) 99 if ( win.isAlreadyDone() )
100 return; 100 return;
101 101
102 win.exec(); 102 win.exec();
103} 103}
104 104
105} 105}
106} 106}
diff --git a/libopie2/opiesecurity/multiauthpassword.h b/libopie2/opiesecurity/multiauthpassword.h
index 3be8322..f43934d 100644
--- a/libopie2/opiesecurity/multiauthpassword.h
+++ b/libopie2/opiesecurity/multiauthpassword.h
@@ -1,59 +1,59 @@
1/** 1/**
2 * \file multiauthpassord.h 2 * \file multiauthpassword.h
3 * \brief Password Dialog dropin. 3 * \brief Password Dialog dropin.
4 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr) 4 * \author Clément Séveillac (clement . seveillac (at) via . ecp . fr)
5 */ 5 */
6/* 6/*
7 =. This file is part of the Opie Project 7 =. This file is part of the Opie Project
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
13.="- .-=="i, .._ License as published by the Free Software 13.="- .-=="i, .._ License as published by the Free Software
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
20 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A 20 =_ + =;=|` MERCHANTABILITY or FITNESS FOR A
21 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU 21 _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU
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,
30 Boston, MA 02111-1307, USA. 30 Boston, MA 02111-1307, USA.
31 31
32*/ 32*/
33 33
34 34
35#ifndef OPIE_SEC_MULTIAUTHPASSWORD_H 35#ifndef OPIE_SEC_MULTIAUTHPASSWORD_H
36#define OPIE_SEC_MULTIAUTHPASSWORD_H 36#define OPIE_SEC_MULTIAUTHPASSWORD_H
37 37
38namespace Opie { 38namespace Opie {
39namespace Security { 39namespace Security {
40 40
41/** 41/**
42 * This is the dropin replacement for libqpes Password class. 42 * This is the dropin replacement for libqpes Password class.
43 * If you call authenticate() a widget will cover the whole screen 43 * If you call authenticate() a widget will cover the whole screen
44 * and only return if the user is able to authenticate with any of the 44 * and only return if the user is able to authenticate with any of the
45 * configured Authentication Plugins. 45 * configured Authentication Plugins.
46 * This uses the \sa Opie::Security::MultiauthMainWindow internally. 46 * This uses the \sa Opie::Security::MultiauthMainWindow internally.
47 * 47 *
48 * @author Clement Séveillac, Holger Freyther 48 * @author Clement Séveillac, Holger Freyther
49 */ 49 */
50class MultiauthPassword { 50class MultiauthPassword {
51public: 51public:
52 static bool needToAuthenticate( bool atpoweron = false ); 52 static bool needToAuthenticate( bool atpoweron = false );
53 static void authenticate(bool atpoweron = false); 53 static void authenticate(bool atpoweron = false);
54}; 54};
55 55
56 56
57} 57}
58} 58}
59#endif 59#endif