author | zecke <zecke> | 2003-05-07 14:45:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-05-07 14:45:49 (UTC) |
commit | 9602e59e3baf01465f4b4139715f2196bb01e012 (patch) (unidiff) | |
tree | 2d7f0dbf91e88de3981fcc82d49ba8ddc05cfbd5 /libopie | |
parent | da949558a957ec4817bf610d7c9186585c0d2d92 (diff) | |
download | opie-9602e59e3baf01465f4b4139715f2196bb01e012.zip opie-9602e59e3baf01465f4b4139715f2196bb01e012.tar.gz opie-9602e59e3baf01465f4b4139715f2196bb01e012.tar.bz2 |
Add d ptr
add comments and FIXMEs
three new signals for otodoaccess
-rw-r--r-- | libopie/colordialog.h | 1 | ||||
-rw-r--r-- | libopie/colorpopupmenu.h | 1 | ||||
-rw-r--r-- | libopie/oclickablelabel.h | 6 | ||||
-rw-r--r-- | libopie/ocolorbutton.h | 1 | ||||
-rw-r--r-- | libopie/odevicebutton.h | 4 | ||||
-rw-r--r-- | libopie/oprocess.h | 6 | ||||
-rw-r--r-- | libopie/orecurrancewidget.h | 3 | ||||
-rw-r--r-- | libopie/otabbar.h | 4 | ||||
-rw-r--r-- | libopie/otabinfo.h | 2 | ||||
-rw-r--r-- | libopie/otabwidget.h | 2 | ||||
-rw-r--r-- | libopie/oticker.h | 1 | ||||
-rw-r--r-- | libopie/otimepicker.h | 2 | ||||
-rw-r--r-- | libopie/owait.h | 3 | ||||
-rw-r--r-- | libopie/pim/otodoaccess.h | 5 | ||||
-rw-r--r-- | libopie/xmltree.h | 2 |
15 files changed, 35 insertions, 8 deletions
diff --git a/libopie/colordialog.h b/libopie/colordialog.h index 1a6a3fd..c825a83 100644 --- a/libopie/colordialog.h +++ b/libopie/colordialog.h | |||
@@ -23,67 +23,68 @@ | |||
23 | ** Agreement provided with the Software. | 23 | ** Agreement provided with the Software. |
24 | ** | 24 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 27 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 29 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 32 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 33 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | 37 | ||
38 | #ifndef OColorDialog_H | 38 | #ifndef OColorDialog_H |
39 | #define OColorDialog_H | 39 | #define OColorDialog_H |
40 | 40 | ||
41 | #ifndef QT_H | 41 | #ifndef QT_H |
42 | #include <qdialog.h> | 42 | #include <qdialog.h> |
43 | #endif // QT_H | 43 | #endif // QT_H |
44 | 44 | ||
45 | class OColorDialogPrivate; | 45 | class OColorDialogPrivate; |
46 | 46 | ||
47 | /* | 47 | /* |
48 | * @class OColorDialog | 48 | * @class OColorDialog |
49 | * @brief The OColorDialog class is a copy of QColorDialog for use in Opie. | 49 | * @brief The OColorDialog class is a copy of QColorDialog for use in Opie. |
50 | * | 50 | * |
51 | * OColorDialog is a copy of TrollTech's QColorDialog for use in Opie. The default | 51 | * OColorDialog is a copy of TrollTech's QColorDialog for use in Opie. The default |
52 | * build of QT/Embedded used by Opie does not include QColorDialog, so it is provided | 52 | * build of QT/Embedded used by Opie does not include QColorDialog, so it is provided |
53 | * here. It is renamed to prevent conflicts in the event the QColorDialog is included | 53 | * here. It is renamed to prevent conflicts in the event the QColorDialog is included |
54 | * at a later date in QP/E. | 54 | * at a later date in QP/E. |
55 | * | 55 | * |
56 | * See http://doc.trolltech.com/2.3/qcolordialog.html for complete documentation of | 56 | * See http://doc.trolltech.com/2.3/qcolordialog.html for complete documentation of |
57 | * QColorDialog. | 57 | * QColorDialog. |
58 | */ | 58 | */ |
59 | class Q_EXPORT OColorDialog : public QDialog | 59 | class Q_EXPORT OColorDialog : public QDialog |
60 | { | 60 | { |
61 | Q_OBJECT | 61 | Q_OBJECT |
62 | 62 | ||
63 | public: | 63 | public: |
64 | static QColor getColor( const QColor&, QWidget *parent=0, const char* name=0 ); | 64 | static QColor getColor( const QColor&, QWidget *parent=0, const char* name=0 ); |
65 | static QRgb getRgba( const QRgb&, bool* ok = 0, | 65 | static QRgb getRgba( const QRgb&, bool* ok = 0, |
66 | QWidget *parent=0, const char* name=0 ); | 66 | QWidget *parent=0, const char* name=0 ); |
67 | 67 | ||
68 | private: | 68 | private: |
69 | ~OColorDialog(); | 69 | ~OColorDialog(); |
70 | 70 | ||
71 | // FIXME add WFlags? -zecke | ||
71 | OColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE ); | 72 | OColorDialog( QWidget* parent=0, const char* name=0, bool modal=FALSE ); |
72 | void setColor( const QColor& ); | 73 | void setColor( const QColor& ); |
73 | QColor color() const; | 74 | QColor color() const; |
74 | 75 | ||
75 | private: | 76 | private: |
76 | void setSelectedAlpha( int ); | 77 | void setSelectedAlpha( int ); |
77 | int selectedAlpha() const; | 78 | int selectedAlpha() const; |
78 | private: | 79 | private: |
79 | OColorDialogPrivate *d; | 80 | OColorDialogPrivate *d; |
80 | friend class OColorDialogPrivate; | 81 | friend class OColorDialogPrivate; |
81 | 82 | ||
82 | private:// Disabled copy constructor and operator= | 83 | private:// Disabled copy constructor and operator= |
83 | #if defined(Q_DISABLE_COPY) | 84 | #if defined(Q_DISABLE_COPY) |
84 | OColorDialog( const OColorDialog & ); | 85 | OColorDialog( const OColorDialog & ); |
85 | OColorDialog& operator=( const OColorDialog & ); | 86 | OColorDialog& operator=( const OColorDialog & ); |
86 | #endif | 87 | #endif |
87 | }; | 88 | }; |
88 | 89 | ||
89 | #endif | 90 | #endif |
diff --git a/libopie/colorpopupmenu.h b/libopie/colorpopupmenu.h index 3e90c5e..98d67cc 100644 --- a/libopie/colorpopupmenu.h +++ b/libopie/colorpopupmenu.h | |||
@@ -133,96 +133,97 @@ signals: | |||
133 | 133 | ||
134 | /** | 134 | /** |
135 | * @fn selected( const QColor& color ) | 135 | * @fn selected( const QColor& color ) |
136 | * @brief Signal to indicate button has been pressed. | 136 | * @brief Signal to indicate button has been pressed. |
137 | * | 137 | * |
138 | * @param color Button color. | 138 | * @param color Button color. |
139 | * | 139 | * |
140 | * This signal is emitted when the button is pressed. It provides the color | 140 | * This signal is emitted when the button is pressed. It provides the color |
141 | * associated to this button. | 141 | * associated to this button. |
142 | */ | 142 | */ |
143 | void selected(const QColor&); | 143 | void selected(const QColor&); |
144 | 144 | ||
145 | private: | 145 | private: |
146 | QColor m_color; | 146 | QColor m_color; |
147 | bool m_active : 1; | 147 | bool m_active : 1; |
148 | class ColorPanelButtonPrivate; | 148 | class ColorPanelButtonPrivate; |
149 | ColorPanelButtonPrivate *d; | 149 | ColorPanelButtonPrivate *d; |
150 | }; | 150 | }; |
151 | 151 | ||
152 | /** | 152 | /** |
153 | * @class OColorPopupMenu | 153 | * @class OColorPopupMenu |
154 | * @brief The OColorPopupMenu class provides a small color selection | 154 | * @brief The OColorPopupMenu class provides a small color selection |
155 | * popup menu. | 155 | * popup menu. |
156 | * | 156 | * |
157 | * OColorPopupMenu is a derivation of TrollTech's QPopupMenu and provides | 157 | * OColorPopupMenu is a derivation of TrollTech's QPopupMenu and provides |
158 | * a small color selection popup menu which can be attached to another control | 158 | * a small color selection popup menu which can be attached to another control |
159 | * such as a toolbar button of menu item. | 159 | * such as a toolbar button of menu item. |
160 | * | 160 | * |
161 | * The popup menu displays 30 default colors available in a grid, and also | 161 | * The popup menu displays 30 default colors available in a grid, and also |
162 | * includes an option at the bottom to display a color selection dialog box for | 162 | * includes an option at the bottom to display a color selection dialog box for |
163 | * finer color control. | 163 | * finer color control. |
164 | */ | 164 | */ |
165 | class OColorPopupMenu : public QPopupMenu | 165 | class OColorPopupMenu : public QPopupMenu |
166 | { | 166 | { |
167 | Q_OBJECT | 167 | Q_OBJECT |
168 | 168 | ||
169 | public: | 169 | public: |
170 | 170 | ||
171 | /** | 171 | /** |
172 | * @fn OColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ) | 172 | * @fn OColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ) |
173 | * @brief Object constructor. | 173 | * @brief Object constructor. |
174 | * | 174 | * |
175 | * @param color Initial color selected in menu. | 175 | * @param color Initial color selected in menu. |
176 | * @param parent Pointer to parent of this control. | 176 | * @param parent Pointer to parent of this control. |
177 | * @param name Name of control. | 177 | * @param name Name of control. |
178 | * | 178 | * |
179 | * Constructs a new OColorPopupMenu control with parent, name and initial color selected. | 179 | * Constructs a new OColorPopupMenu control with parent, name and initial color selected. |
180 | */ | 180 | */ |
181 | // FIXME add Wflags? -zecke | ||
181 | OColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ); | 182 | OColorPopupMenu( const QColor& color, QWidget* parent = 0, const char* name = 0 ); |
182 | 183 | ||
183 | /** | 184 | /** |
184 | * @fn ~OColorPopupMenu() | 185 | * @fn ~OColorPopupMenu() |
185 | * @brief Object destructor. | 186 | * @brief Object destructor. |
186 | */ | 187 | */ |
187 | ~OColorPopupMenu(); | 188 | ~OColorPopupMenu(); |
188 | 189 | ||
189 | private: | 190 | private: |
190 | class ColorPopupMenuPrivate; | 191 | class ColorPopupMenuPrivate; |
191 | ColorPopupMenuPrivate *d; | 192 | ColorPopupMenuPrivate *d; |
192 | QColor m_color; | 193 | QColor m_color; |
193 | QWidget* colorPanel; | 194 | QWidget* colorPanel; |
194 | QGridLayout* colorLayout; | 195 | QGridLayout* colorLayout; |
195 | 196 | ||
196 | /** | 197 | /** |
197 | * @fn addColor( const QColor& color, int row, int col ) | 198 | * @fn addColor( const QColor& color, int row, int col ) |
198 | * @brief Adds color selection option to popup menu. | 199 | * @brief Adds color selection option to popup menu. |
199 | * | 200 | * |
200 | * @param color Color to be displayed in menu. | 201 | * @param color Color to be displayed in menu. |
201 | * @param row Row where color is to appear in menu. | 202 | * @param row Row where color is to appear in menu. |
202 | * @param col Column where color is to appear in menu. | 203 | * @param col Column where color is to appear in menu. |
203 | * | 204 | * |
204 | * Adds a color selection option to popup menu. Used internally when | 205 | * Adds a color selection option to popup menu. Used internally when |
205 | * initially constructing the menu control. | 206 | * initially constructing the menu control. |
206 | */ | 207 | */ |
207 | void addColor( const QColor& color, int row, int col ); | 208 | void addColor( const QColor& color, int row, int col ); |
208 | 209 | ||
209 | signals: | 210 | signals: |
210 | 211 | ||
211 | /** | 212 | /** |
212 | * @fn colorSelected( const QColor& color ) | 213 | * @fn colorSelected( const QColor& color ) |
213 | * @brief Signal to indicate color chosen from the menu. | 214 | * @brief Signal to indicate color chosen from the menu. |
214 | * | 215 | * |
215 | * @param color Color selected from the menu. | 216 | * @param color Color selected from the menu. |
216 | * | 217 | * |
217 | * This signal is emitted when a color has been selected either directly from | 218 | * This signal is emitted when a color has been selected either directly from |
218 | * the menu, or chosen from the color selection dialog. | 219 | * the menu, or chosen from the color selection dialog. |
219 | */ | 220 | */ |
220 | void colorSelected( const QColor& color ); | 221 | void colorSelected( const QColor& color ); |
221 | 222 | ||
222 | protected slots: | 223 | protected slots: |
223 | 224 | ||
224 | /** | 225 | /** |
225 | * @fn buttonSelected( const QColor& color ) | 226 | * @fn buttonSelected( const QColor& color ) |
226 | * @brief Slot to process selected color. | 227 | * @brief Slot to process selected color. |
227 | * | 228 | * |
228 | * @param color Color selected from the menu. | 229 | * @param color Color selected from the menu. |
diff --git a/libopie/oclickablelabel.h b/libopie/oclickablelabel.h index 6e7a123..f93ade0 100644 --- a/libopie/oclickablelabel.h +++ b/libopie/oclickablelabel.h | |||
@@ -4,61 +4,65 @@ | |||
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | 5 | ||
6 | /** | 6 | /** |
7 | * This class is a special QLabel which can behave | 7 | * This class is a special QLabel which can behave |
8 | * as a QPushButton or QToggleButton. | 8 | * as a QPushButton or QToggleButton. |
9 | * The reason to use a clickable is if you want to save space | 9 | * The reason to use a clickable is if you want to save space |
10 | * or you want to skip the border of a normal button | 10 | * or you want to skip the border of a normal button |
11 | * | 11 | * |
12 | * <pre> | 12 | * <pre> |
13 | * QLabel* lbl = new OClickableLabel( parent, "PushLabel" ); | 13 | * QLabel* lbl = new OClickableLabel( parent, "PushLabel" ); |
14 | * lbl->setPixmap( "config" ); | 14 | * lbl->setPixmap( "config" ); |
15 | * QWhatsThis::add( lbl, tr("Click here to do something") ); | 15 | * QWhatsThis::add( lbl, tr("Click here to do something") ); |
16 | * </pre> | 16 | * </pre> |
17 | * | 17 | * |
18 | * @short A Label behaving as button | 18 | * @short A Label behaving as button |
19 | * @author Hakan Ardo, Maximillian Reiß ( harlekin@handhelds.org ) | 19 | * @author Hakan Ardo, Maximillian Reiß ( harlekin@handhelds.org ) |
20 | * @see QLabel | 20 | * @see QLabel |
21 | * @see QPushButton | 21 | * @see QPushButton |
22 | * @see QToggleButton | 22 | * @see QToggleButton |
23 | * @version 1.0 | 23 | * @version 1.0 |
24 | */ | 24 | */ |
25 | 25 | ||
26 | class OClickableLabel: public QLabel | 26 | class OClickableLabel: public QLabel |
27 | { | 27 | { |
28 | Q_OBJECT | 28 | Q_OBJECT |
29 | public: | 29 | public: |
30 | OClickableLabel(QWidget* parent = 0, const char* name = 0, | 30 | OClickableLabel(QWidget* parent = 0, const char* name = 0, |
31 | WFlags fl = 0); | 31 | WFlags fl = 0); |
32 | void setToggleButton(bool t); | 32 | void setToggleButton(bool t); |
33 | 33 | ||
34 | protected: | 34 | protected: |
35 | /** @internal */ | 35 | /** @internal */ |
36 | void mousePressEvent( QMouseEvent *e ); | 36 | void mousePressEvent( QMouseEvent *e ); |
37 | /** @internal */ | 37 | /** @internal */ |
38 | void mouseReleaseEvent( QMouseEvent *e ); | 38 | void mouseReleaseEvent( QMouseEvent *e ); |
39 | /** @internal */ | 39 | /** @internal */ |
40 | void mouseMoveEvent( QMouseEvent *e ); | 40 | void mouseMoveEvent( QMouseEvent *e ); |
41 | 41 | ||
42 | public slots: | 42 | public slots: |
43 | void setOn(bool on); | 43 | void setOn(bool on); |
44 | signals: | 44 | signals: |
45 | /** | 45 | /** |
46 | * emitted when the labels gets clicked | 46 | * emitted when the labels gets clicked |
47 | */ | 47 | */ |
48 | void clicked(); | 48 | void clicked(); |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * emitted when the labels gets toggled | 51 | * emitted when the labels gets toggled |
52 | * @param the new new state of the label | 52 | * @param on the new new state of the label |
53 | */ | 53 | */ |
54 | void toggled(bool on); | 54 | void toggled(bool on); |
55 | private: | 55 | private: |
56 | bool isToggle : 1; | 56 | bool isToggle : 1; |
57 | bool isDown : 1; | 57 | bool isDown : 1; |
58 | bool textInverted : 1; | 58 | bool textInverted : 1; |
59 | 59 | ||
60 | void showState(bool on); | 60 | void showState(bool on); |
61 | void setInverted(bool on); | 61 | void setInverted(bool on); |
62 | |||
63 | private: | ||
64 | class Private; | ||
65 | Private *d; // private d pointer | ||
62 | }; | 66 | }; |
63 | 67 | ||
64 | #endif | 68 | #endif |
diff --git a/libopie/ocolorbutton.h b/libopie/ocolorbutton.h index 7ff9cd2..6196c83 100644 --- a/libopie/ocolorbutton.h +++ b/libopie/ocolorbutton.h | |||
@@ -1,72 +1,73 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 3 | .=l. Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> |
4 | .>+-= | 4 | .>+-= |
5 | _;:, .> :=|. This library is free software; you can | 5 | _;:, .> :=|. This library is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #ifndef __OPIE_OCOLORBUTTON_H__ | 29 | #ifndef __OPIE_OCOLORBUTTON_H__ |
30 | #define __OPIE_OCOLORBUTTON_H__ | 30 | #define __OPIE_OCOLORBUTTON_H__ |
31 | 31 | ||
32 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
33 | 33 | ||
34 | class OColorButtonPrivate; | 34 | class OColorButtonPrivate; |
35 | class QColor; | 35 | class QColor; |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * | 38 | * |
39 | * @short A Button which will show a OColorPopupMenu | 39 | * @short A Button which will show a OColorPopupMenu |
40 | * @author Robert Griebl ( sandman@handhelds.org ) | 40 | * @author Robert Griebl ( sandman@handhelds.org ) |
41 | * @version 1.0 | 41 | * @version 1.0 |
42 | * @see QPushButton | 42 | * @see QPushButton |
43 | */ | 43 | */ |
44 | class OColorButton : public QPushButton { | 44 | class OColorButton : public QPushButton { |
45 | Q_OBJECT | 45 | Q_OBJECT |
46 | public: | 46 | public: |
47 | // FIXME Wflags? -zecke | ||
47 | OColorButton ( QWidget *parent = 0, const QColor & = black, const char *name = 0 ); | 48 | OColorButton ( QWidget *parent = 0, const QColor & = black, const char *name = 0 ); |
48 | virtual ~OColorButton ( ); | 49 | virtual ~OColorButton ( ); |
49 | 50 | ||
50 | QColor color ( ) const; | 51 | QColor color ( ) const; |
51 | 52 | ||
52 | signals: | 53 | signals: |
53 | /** | 54 | /** |
54 | * emitted when a color gets selected | 55 | * emitted when a color gets selected |
55 | */ | 56 | */ |
56 | void colorSelected ( const QColor & ); | 57 | void colorSelected ( const QColor & ); |
57 | 58 | ||
58 | public slots: | 59 | public slots: |
59 | virtual void setColor ( const QColor & ); | 60 | virtual void setColor ( const QColor & ); |
60 | 61 | ||
61 | protected slots: | 62 | protected slots: |
62 | /** | 63 | /** |
63 | * @internal | 64 | * @internal |
64 | */ | 65 | */ |
65 | virtual void updateColor ( const QColor & ); | 66 | virtual void updateColor ( const QColor & ); |
66 | 67 | ||
67 | private: | 68 | private: |
68 | OColorButtonPrivate *d; | 69 | OColorButtonPrivate *d; |
69 | }; | 70 | }; |
70 | 71 | ||
71 | #endif | 72 | #endif |
72 | 73 | ||
diff --git a/libopie/odevicebutton.h b/libopie/odevicebutton.h index cf91bbd..abe27d6 100644 --- a/libopie/odevicebutton.h +++ b/libopie/odevicebutton.h | |||
@@ -5,97 +5,101 @@ | |||
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef DEVICE_BUTTON_H | 20 | #ifndef DEVICE_BUTTON_H |
21 | #define DEVICE_BUTTON_H | 21 | #define DEVICE_BUTTON_H |
22 | 22 | ||
23 | #include <qpixmap.h> | 23 | #include <qpixmap.h> |
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | 25 | ||
26 | class OQCopMessageData; | 26 | class OQCopMessageData; |
27 | 27 | ||
28 | namespace Opie | 28 | namespace Opie |
29 | { | 29 | { |
30 | 30 | ||
31 | class OQCopMessage { | 31 | class OQCopMessage { |
32 | public: | 32 | public: |
33 | OQCopMessage ( ); | 33 | OQCopMessage ( ); |
34 | OQCopMessage ( const OQCopMessage © ); | 34 | OQCopMessage ( const OQCopMessage © ); |
35 | OQCopMessage ( const QCString &m_channel, const QCString &message, const QByteArray &args = QByteArray ( )); | 35 | OQCopMessage ( const QCString &m_channel, const QCString &message, const QByteArray &args = QByteArray ( )); |
36 | 36 | ||
37 | OQCopMessage &operator = ( const OQCopMessage &assign ); | 37 | OQCopMessage &operator = ( const OQCopMessage &assign ); |
38 | 38 | ||
39 | void setChannel ( const QCString &channel ); | 39 | void setChannel ( const QCString &channel ); |
40 | void setMessage ( const QCString &message ); | 40 | void setMessage ( const QCString &message ); |
41 | void setData ( const QByteArray &ba ); | 41 | void setData ( const QByteArray &ba ); |
42 | 42 | ||
43 | QCString channel ( ) const; | 43 | QCString channel ( ) const; |
44 | QCString message ( ) const; | 44 | QCString message ( ) const; |
45 | QByteArray data ( ) const; | 45 | QByteArray data ( ) const; |
46 | 46 | ||
47 | bool send ( ); | 47 | bool send ( ); |
48 | 48 | ||
49 | private: | 49 | private: |
50 | void init ( const QCString &m_channel, const QCString &message, const QByteArray &args ); | 50 | void init ( const QCString &m_channel, const QCString &message, const QByteArray &args ); |
51 | 51 | ||
52 | OQCopMessageData *d; | 52 | OQCopMessageData *d; |
53 | class Private; | ||
54 | Private* data; | ||
53 | }; | 55 | }; |
54 | 56 | ||
55 | 57 | ||
56 | /** | 58 | /** |
57 | * This class represents a physical button on a Qtopia device. A device may | 59 | * This class represents a physical button on a Qtopia device. A device may |
58 | * have n "user programmable" buttons, which are number 1..n. The location | 60 | * have n "user programmable" buttons, which are number 1..n. The location |
59 | * and number of buttons will vary from device to device. userText() and pixmap() | 61 | * and number of buttons will vary from device to device. userText() and pixmap() |
60 | * may be used to describe this button to the user in help documentation. | 62 | * may be used to describe this button to the user in help documentation. |
61 | * | 63 | * |
62 | * @version 1.0 | 64 | * @version 1.0 |
63 | * @author Trolltech | 65 | * @author Trolltech |
64 | * @short A representation of buttons | 66 | * @short A representation of buttons |
65 | */ | 67 | */ |
66 | 68 | ||
67 | class ODeviceButton | 69 | class ODeviceButton |
68 | { | 70 | { |
69 | public: | 71 | public: |
70 | ODeviceButton(); | 72 | ODeviceButton(); |
71 | virtual ~ODeviceButton(); | 73 | virtual ~ODeviceButton(); |
72 | 74 | ||
73 | ushort keycode ( ) const; | 75 | ushort keycode ( ) const; |
74 | QString userText ( ) const; | 76 | QString userText ( ) const; |
75 | QPixmap pixmap ( ) const; | 77 | QPixmap pixmap ( ) const; |
76 | OQCopMessage factoryPresetPressedAction ( ) const; | 78 | OQCopMessage factoryPresetPressedAction ( ) const; |
77 | OQCopMessage pressedAction ( ) const; | 79 | OQCopMessage pressedAction ( ) const; |
78 | OQCopMessage factoryPresetHeldAction ( ) const; | 80 | OQCopMessage factoryPresetHeldAction ( ) const; |
79 | OQCopMessage heldAction ( ) const; | 81 | OQCopMessage heldAction ( ) const; |
80 | 82 | ||
81 | void setKeycode ( ushort keycode ); | 83 | void setKeycode ( ushort keycode ); |
82 | void setUserText ( const QString& text ); | 84 | void setUserText ( const QString& text ); |
83 | void setPixmap ( const QPixmap& picture ); | 85 | void setPixmap ( const QPixmap& picture ); |
84 | void setFactoryPresetPressedAction ( const OQCopMessage& qcopMessage ); | 86 | void setFactoryPresetPressedAction ( const OQCopMessage& qcopMessage ); |
85 | void setPressedAction ( const OQCopMessage& qcopMessage ); | 87 | void setPressedAction ( const OQCopMessage& qcopMessage ); |
86 | void setFactoryPresetHeldAction ( const OQCopMessage& qcopMessage ); | 88 | void setFactoryPresetHeldAction ( const OQCopMessage& qcopMessage ); |
87 | void setHeldAction ( const OQCopMessage& qcopMessage ); | 89 | void setHeldAction ( const OQCopMessage& qcopMessage ); |
88 | 90 | ||
89 | private: | 91 | private: |
90 | ushort m_Keycode; | 92 | ushort m_Keycode; |
91 | QString m_UserText; | 93 | QString m_UserText; |
92 | QPixmap m_Pixmap; | 94 | QPixmap m_Pixmap; |
93 | OQCopMessage m_FactoryPresetPressedAction; | 95 | OQCopMessage m_FactoryPresetPressedAction; |
94 | OQCopMessage m_PressedAction; | 96 | OQCopMessage m_PressedAction; |
95 | OQCopMessage m_FactoryPresetHeldAction; | 97 | OQCopMessage m_FactoryPresetHeldAction; |
96 | OQCopMessage m_HeldAction; | 98 | OQCopMessage m_HeldAction; |
99 | class Private; | ||
100 | Private *d; | ||
97 | }; | 101 | }; |
98 | 102 | ||
99 | } | 103 | } |
100 | 104 | ||
101 | #endif | 105 | #endif |
diff --git a/libopie/oprocess.h b/libopie/oprocess.h index f2853b0..af7cddb 100644 --- a/libopie/oprocess.h +++ b/libopie/oprocess.h | |||
@@ -261,102 +261,96 @@ public: | |||
261 | * For a detailed description of the | 261 | * For a detailed description of the |
262 | * various run modes and communication semantics, have a look at the | 262 | * various run modes and communication semantics, have a look at the |
263 | * general description of the OProcess class. | 263 | * general description of the OProcess class. |
264 | * | 264 | * |
265 | * The following problems could cause this function to | 265 | * The following problems could cause this function to |
266 | * return false: | 266 | * return false: |
267 | * | 267 | * |
268 | * @li The process is already running. | 268 | * @li The process is already running. |
269 | * @li The command line argument list is empty. | 269 | * @li The command line argument list is empty. |
270 | * @li The starting of the process failed (could not fork). | 270 | * @li The starting of the process failed (could not fork). |
271 | * @li The executable was not found. | 271 | * @li The executable was not found. |
272 | * | 272 | * |
273 | * @param comm Specifies which communication links should be | 273 | * @param comm Specifies which communication links should be |
274 | * established to the child process (stdin/stdout/stderr). By default, | 274 | * established to the child process (stdin/stdout/stderr). By default, |
275 | * no communication takes place and the respective communication | 275 | * no communication takes place and the respective communication |
276 | * signals will never get emitted. | 276 | * signals will never get emitted. |
277 | * | 277 | * |
278 | * @return true on success, false on error | 278 | * @return true on success, false on error |
279 | * (see above for error conditions) | 279 | * (see above for error conditions) |
280 | **/ | 280 | **/ |
281 | virtual bool start(RunMode runmode = NotifyOnExit, | 281 | virtual bool start(RunMode runmode = NotifyOnExit, |
282 | Communication comm = NoCommunication); | 282 | Communication comm = NoCommunication); |
283 | 283 | ||
284 | /** | 284 | /** |
285 | * Stop the process (by sending it a signal). | 285 | * Stop the process (by sending it a signal). |
286 | * | 286 | * |
287 | * @param signoThe signal to send. The default is SIGTERM. | 287 | * @param signoThe signal to send. The default is SIGTERM. |
288 | * @return @p true if the signal was delivered successfully. | 288 | * @return @p true if the signal was delivered successfully. |
289 | */ | 289 | */ |
290 | virtual bool kill(int signo = SIGTERM); | 290 | virtual bool kill(int signo = SIGTERM); |
291 | 291 | ||
292 | /** | 292 | /** |
293 | @return @p true if the process is (still) considered to be running | 293 | @return @p true if the process is (still) considered to be running |
294 | */ | 294 | */ |
295 | bool isRunning() const; | 295 | bool isRunning() const; |
296 | 296 | ||
297 | /** Returns the process id of the process. | 297 | /** Returns the process id of the process. |
298 | * | 298 | * |
299 | * If it is called after | 299 | * If it is called after |
300 | * the process has exited, it returns the process id of the last | 300 | * the process has exited, it returns the process id of the last |
301 | * child process that was created by this instance of OProcess. | 301 | * child process that was created by this instance of OProcess. |
302 | * | 302 | * |
303 | * Calling it before any child process has been started by this | 303 | * Calling it before any child process has been started by this |
304 | * OProcess instance causes pid() to return 0. | 304 | * OProcess instance causes pid() to return 0. |
305 | **/ | 305 | **/ |
306 | pid_t pid() const; | 306 | pid_t pid() const; |
307 | 307 | ||
308 | /** | 308 | /** |
309 | * Use pid(). | ||
310 | * @deprecated | ||
311 | */ | ||
312 | pid_t getPid() const { return pid(); } | ||
313 | |||
314 | /** | ||
315 | * Suspend processing of data from stdout of the child process. | 309 | * Suspend processing of data from stdout of the child process. |
316 | */ | 310 | */ |
317 | void suspend(); | 311 | void suspend(); |
318 | 312 | ||
319 | /** | 313 | /** |
320 | * Resume processing of data from stdout of the child process. | 314 | * Resume processing of data from stdout of the child process. |
321 | */ | 315 | */ |
322 | void resume(); | 316 | void resume(); |
323 | 317 | ||
324 | /** | 318 | /** |
325 | * @return @p true if the process has already finished and has exited | 319 | * @return @p true if the process has already finished and has exited |
326 | * "voluntarily", ie: it has not been killed by a signal. | 320 | * "voluntarily", ie: it has not been killed by a signal. |
327 | * | 321 | * |
328 | * Note that you should check @ref OProcess::exitStatus() to determine | 322 | * Note that you should check @ref OProcess::exitStatus() to determine |
329 | * whether the process completed its task successful or not. | 323 | * whether the process completed its task successful or not. |
330 | */ | 324 | */ |
331 | bool normalExit() const; | 325 | bool normalExit() const; |
332 | 326 | ||
333 | /** | 327 | /** |
334 | * Returns the exit status of the process. | 328 | * Returns the exit status of the process. |
335 | * | 329 | * |
336 | * Please use | 330 | * Please use |
337 | * @ref OProcess::normalExit() to check whether the process has exited | 331 | * @ref OProcess::normalExit() to check whether the process has exited |
338 | * cleanly (i.e., @ref OProcess::normalExit() returns @p true) before calling | 332 | * cleanly (i.e., @ref OProcess::normalExit() returns @p true) before calling |
339 | * this function because if the process did not exit normally, | 333 | * this function because if the process did not exit normally, |
340 | * it does not have a valid exit status. | 334 | * it does not have a valid exit status. |
341 | */ | 335 | */ |
342 | int exitStatus() const; | 336 | int exitStatus() const; |
343 | 337 | ||
344 | 338 | ||
345 | /** | 339 | /** |
346 | * Transmit data to the child process's stdin. | 340 | * Transmit data to the child process's stdin. |
347 | * | 341 | * |
348 | * OProcess::writeStdin may return false in the following cases: | 342 | * OProcess::writeStdin may return false in the following cases: |
349 | * | 343 | * |
350 | * @li The process is not currently running. | 344 | * @li The process is not currently running. |
351 | * | 345 | * |
352 | * @li Communication to stdin has not been requested in the @ref start() call. | 346 | * @li Communication to stdin has not been requested in the @ref start() call. |
353 | * | 347 | * |
354 | * @li Transmission of data to the child process by a previous call to | 348 | * @li Transmission of data to the child process by a previous call to |
355 | * @ref writeStdin() is still in progress. | 349 | * @ref writeStdin() is still in progress. |
356 | * | 350 | * |
357 | * Please note that the data is sent to the client asynchronously, | 351 | * Please note that the data is sent to the client asynchronously, |
358 | * so when this function returns, the data might not have been | 352 | * so when this function returns, the data might not have been |
359 | * processed by the child process. | 353 | * processed by the child process. |
360 | * | 354 | * |
361 | * If all the data has been sent to the client, the signal | 355 | * If all the data has been sent to the client, the signal |
362 | * @ref wroteStdin() will be emitted. | 356 | * @ref wroteStdin() will be emitted. |
diff --git a/libopie/orecurrancewidget.h b/libopie/orecurrancewidget.h index a5d6489..37a57f0 100644 --- a/libopie/orecurrancewidget.h +++ b/libopie/orecurrancewidget.h | |||
@@ -39,52 +39,55 @@ public: | |||
39 | ORecurranceWidget( bool startOnMonday, | 39 | ORecurranceWidget( bool startOnMonday, |
40 | const ORecur& rp, const QDate& start, | 40 | const ORecur& rp, const QDate& start, |
41 | QWidget* parent = 0, const char* name =0, | 41 | QWidget* parent = 0, const char* name =0, |
42 | bool modal = TRUE, WFlags = 0 ); | 42 | bool modal = TRUE, WFlags = 0 ); |
43 | ~ORecurranceWidget(); | 43 | ~ORecurranceWidget(); |
44 | ORecur recurrence()const; | 44 | ORecur recurrence()const; |
45 | QDate endDate()const; | 45 | QDate endDate()const; |
46 | 46 | ||
47 | public slots: | 47 | public slots: |
48 | void slotSetRType( int ); | 48 | void slotSetRType( int ); |
49 | /** | 49 | /** |
50 | * set the new end date | 50 | * set the new end date |
51 | */ | 51 | */ |
52 | void endDateChanged( int, int, int ); | 52 | void endDateChanged( int, int, int ); |
53 | /** | 53 | /** |
54 | * enable/disable end date | 54 | * enable/disable end date |
55 | */ | 55 | */ |
56 | void slotNoEnd( bool unused ); | 56 | void slotNoEnd( bool unused ); |
57 | void setStartDate( const QDate& ); | 57 | void setStartDate( const QDate& ); |
58 | void setRecurrence( const ORecur& recur, const QDate& start ); | 58 | void setRecurrence( const ORecur& recur, const QDate& start ); |
59 | void setRecurrence( const ORecur& recur ); | 59 | void setRecurrence( const ORecur& recur ); |
60 | 60 | ||
61 | private slots: | 61 | private slots: |
62 | void setupRepeatLabel( const QString& ); | 62 | void setupRepeatLabel( const QString& ); |
63 | void setupRepeatLabel( int ); | 63 | void setupRepeatLabel( int ); |
64 | void slotWeekLabel(); | 64 | void slotWeekLabel(); |
65 | void slotMonthLabel( int ); | 65 | void slotMonthLabel( int ); |
66 | void slotChangeStartOfWeek( bool onMonday ); | 66 | void slotChangeStartOfWeek( bool onMonday ); |
67 | 67 | ||
68 | private: | 68 | private: |
69 | void setupNone(); | 69 | void setupNone(); |
70 | void setupDaily(); | 70 | void setupDaily(); |
71 | void setupWeekly(); | 71 | void setupWeekly(); |
72 | void setupMonthly(); | 72 | void setupMonthly(); |
73 | void setupYearly(); | 73 | void setupYearly(); |
74 | 74 | ||
75 | enum repeatButtons { None, Day, Week, Month, Year }; | 75 | enum repeatButtons { None, Day, Week, Month, Year }; |
76 | void init(); | 76 | void init(); |
77 | void hideExtras(); | 77 | void hideExtras(); |
78 | void showRepeatStuff(); | 78 | void showRepeatStuff(); |
79 | 79 | ||
80 | QList<QToolButton> listRTypeButtons; | 80 | QList<QToolButton> listRTypeButtons; |
81 | QList<QToolButton> listExtra; | 81 | QList<QToolButton> listExtra; |
82 | QDate start; // only used in one spot... | 82 | QDate start; // only used in one spot... |
83 | QDate end; | 83 | QDate end; |
84 | repeatButtons currInterval; | 84 | repeatButtons currInterval; |
85 | bool startWeekOnMonday : 1; | 85 | bool startWeekOnMonday : 1; |
86 | DateBookMonth *repeatPicker; | 86 | DateBookMonth *repeatPicker; |
87 | |||
88 | class Private; | ||
89 | Private *d; | ||
87 | 90 | ||
88 | }; | 91 | }; |
89 | 92 | ||
90 | #endif | 93 | #endif |
diff --git a/libopie/otabbar.h b/libopie/otabbar.h index 0b353e2..668187b 100644 --- a/libopie/otabbar.h +++ b/libopie/otabbar.h | |||
@@ -26,51 +26,55 @@ | |||
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #ifndef OTABBAR_H | 32 | #ifndef OTABBAR_H |
33 | #define OTABBAR_H | 33 | #define OTABBAR_H |
34 | 34 | ||
35 | #include <qtabbar.h> | 35 | #include <qtabbar.h> |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * @class OTabBar | 38 | * @class OTabBar |
39 | * @brief The OTabBar class is a derivative of QTabBar. | 39 | * @brief The OTabBar class is a derivative of QTabBar. |
40 | * | 40 | * |
41 | * OTabBar is a derivation of TrollTech's QTabBar which provides | 41 | * OTabBar is a derivation of TrollTech's QTabBar which provides |
42 | * a row of tabs for selection. The only difference between this | 42 | * a row of tabs for selection. The only difference between this |
43 | * class and QTabBar is that there is no dotted line box around | 43 | * class and QTabBar is that there is no dotted line box around |
44 | * the label of the tab with the current focus. | 44 | * the label of the tab with the current focus. |
45 | */ | 45 | */ |
46 | class OTabBar : public QTabBar | 46 | class OTabBar : public QTabBar |
47 | { | 47 | { |
48 | Q_OBJECT | 48 | Q_OBJECT |
49 | 49 | ||
50 | public: | 50 | public: |
51 | /** | 51 | /** |
52 | * @fn OTabBar( QWidget *parent = 0, const char *name = 0 ) | 52 | * @fn OTabBar( QWidget *parent = 0, const char *name = 0 ) |
53 | * @brief Object constructor. | 53 | * @brief Object constructor. |
54 | * | 54 | * |
55 | * @param parent Pointer to parent of this control. | 55 | * @param parent Pointer to parent of this control. |
56 | * @param name Name of control. | 56 | * @param name Name of control. |
57 | * | 57 | * |
58 | * Constructs a new OTabBar control with parent and name. | 58 | * Constructs a new OTabBar control with parent and name. |
59 | */ | 59 | */ |
60 | // FIXME Allow WFlags? -zecke | 60 | // FIXME Allow WFlags? -zecke |
61 | OTabBar( QWidget * = 0, const char * = 0 ); | 61 | OTabBar( QWidget * = 0, const char * = 0 ); |
62 | 62 | ||
63 | protected: | 63 | protected: |
64 | /** | 64 | /** |
65 | * @fn paintLabel( QPainter* p, const QRect& br , QTab* t, bool has_focus)const | 65 | * @fn paintLabel( QPainter* p, const QRect& br , QTab* t, bool has_focus)const |
66 | * @brief Internal function to draw a tab's label. | 66 | * @brief Internal function to draw a tab's label. |
67 | * | 67 | * |
68 | * @param p Pointer to QPainter used for drawing. | 68 | * @param p Pointer to QPainter used for drawing. |
69 | * @param br QRect providing region to draw label in. | 69 | * @param br QRect providing region to draw label in. |
70 | * @param t Tab to draw label for. | 70 | * @param t Tab to draw label for. |
71 | * @param has_focus Boolean value not used, retained for compatibility reasons. | 71 | * @param has_focus Boolean value not used, retained for compatibility reasons. |
72 | */ | 72 | */ |
73 | void paintLabel( QPainter *, const QRect &, QTab *, bool ) const; | 73 | void paintLabel( QPainter *, const QRect &, QTab *, bool ) const; |
74 | |||
75 | private: | ||
76 | class Private; | ||
77 | Private *d; | ||
74 | }; | 78 | }; |
75 | 79 | ||
76 | #endif | 80 | #endif |
diff --git a/libopie/otabinfo.h b/libopie/otabinfo.h index eebaf8e..00bb06d 100644 --- a/libopie/otabinfo.h +++ b/libopie/otabinfo.h | |||
@@ -76,57 +76,59 @@ public: | |||
76 | OTabInfo( int id, QWidget *control, const QString &icon, const QString &label ) | 76 | OTabInfo( int id, QWidget *control, const QString &icon, const QString &label ) |
77 | : i( id ), c( control ), p( icon ), l( label ) {} | 77 | : i( id ), c( control ), p( icon ), l( label ) {} |
78 | 78 | ||
79 | /** | 79 | /** |
80 | * @fn id()const | 80 | * @fn id()const |
81 | * @brief Returns TabBar ID. | 81 | * @brief Returns TabBar ID. |
82 | */ | 82 | */ |
83 | int id() const { return i; } | 83 | int id() const { return i; } |
84 | 84 | ||
85 | /** | 85 | /** |
86 | * @fn label()const | 86 | * @fn label()const |
87 | * @brief Returns text label for widget. | 87 | * @brief Returns text label for widget. |
88 | */ | 88 | */ |
89 | const QString &label() const { return l; } | 89 | const QString &label() const { return l; } |
90 | 90 | ||
91 | /** | 91 | /** |
92 | * @fn setLabel( const QString &label ) | 92 | * @fn setLabel( const QString &label ) |
93 | * @brief Set label for tab. | 93 | * @brief Set label for tab. |
94 | * | 94 | * |
95 | * @param label QString text label for OTabWidget selection control. | 95 | * @param label QString text label for OTabWidget selection control. |
96 | */ | 96 | */ |
97 | void setLabel( const QString &label ) { l = label; } | 97 | void setLabel( const QString &label ) { l = label; } |
98 | 98 | ||
99 | /** | 99 | /** |
100 | * @fn control()const | 100 | * @fn control()const |
101 | * @brief Returns pointer to widget. | 101 | * @brief Returns pointer to widget. |
102 | */ | 102 | */ |
103 | QWidget *control() const { return c; } | 103 | QWidget *control() const { return c; } |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * @fn icon()const | 106 | * @fn icon()const |
107 | * @brief Returns name of icon file. | 107 | * @brief Returns name of icon file. |
108 | */ | 108 | */ |
109 | const QString &icon() const { return p; } | 109 | const QString &icon() const { return p; } |
110 | 110 | ||
111 | /** | 111 | /** |
112 | * @fn setIcon( const QString &icon ) | 112 | * @fn setIcon( const QString &icon ) |
113 | * @brief Set icon for tab. | 113 | * @brief Set icon for tab. |
114 | * | 114 | * |
115 | * @param icon QString name of icon file. | 115 | * @param icon QString name of icon file. |
116 | */ | 116 | */ |
117 | void setIcon( const QString &icon ) { p = icon; } | 117 | void setIcon( const QString &icon ) { p = icon; } |
118 | 118 | ||
119 | private: | 119 | private: |
120 | int i; | 120 | int i; |
121 | QWidget *c; | 121 | QWidget *c; |
122 | QString p; | 122 | QString p; |
123 | QString l; | 123 | QString l; |
124 | class Private; | ||
125 | Private *d; | ||
124 | }; | 126 | }; |
125 | 127 | ||
126 | /** | 128 | /** |
127 | * @class OTabInfoList | 129 | * @class OTabInfoList |
128 | * @brief A list of OTabInfo objects used by OTabWidget. | 130 | * @brief A list of OTabInfo objects used by OTabWidget. |
129 | */ | 131 | */ |
130 | typedef QList<OTabInfo> OTabInfoList; | 132 | typedef QList<OTabInfo> OTabInfoList; |
131 | 133 | ||
132 | #endif | 134 | #endif |
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h index a67fe06..c140c0b 100644 --- a/libopie/otabwidget.h +++ b/libopie/otabwidget.h | |||
@@ -176,96 +176,98 @@ public: | |||
176 | * @fn setCurrentTab( const QString &tabname ) | 176 | * @fn setCurrentTab( const QString &tabname ) |
177 | * @brief Selects and brings to top the desired widget, by using label. | 177 | * @brief Selects and brings to top the desired widget, by using label. |
178 | * | 178 | * |
179 | * @param tabname Text label for widget to select. | 179 | * @param tabname Text label for widget to select. |
180 | */ | 180 | */ |
181 | void setCurrentTab( const QString & ); | 181 | void setCurrentTab( const QString & ); |
182 | 182 | ||
183 | /** | 183 | /** |
184 | * @fn setCurrentTab( int ) | 184 | * @fn setCurrentTab( int ) |
185 | * @brief Selects and brings to top the desired widget, by using id. | 185 | * @brief Selects and brings to top the desired widget, by using id. |
186 | * | 186 | * |
187 | * @param tab id for widget to select. | 187 | * @param tab id for widget to select. |
188 | */ | 188 | */ |
189 | void setCurrentTab(int); | 189 | void setCurrentTab(int); |
190 | 190 | ||
191 | /** | 191 | /** |
192 | * @fn sizeHint()const | 192 | * @fn sizeHint()const |
193 | * @brief Reimplemented for internal purposes. | 193 | * @brief Reimplemented for internal purposes. |
194 | */ | 194 | */ |
195 | QSize sizeHint() const; | 195 | QSize sizeHint() const; |
196 | 196 | ||
197 | /** | 197 | /** |
198 | * @fn currentTab( ) | 198 | * @fn currentTab( ) |
199 | * @brief returns current tab id. | 199 | * @brief returns current tab id. |
200 | */ | 200 | */ |
201 | int currentTab(); | 201 | int currentTab(); |
202 | 202 | ||
203 | 203 | ||
204 | protected: | 204 | protected: |
205 | 205 | ||
206 | /** | 206 | /** |
207 | * @fn resizeEvent( QResizeEvent * ) | 207 | * @fn resizeEvent( QResizeEvent * ) |
208 | * @brief Reimplemented for internal purposes. | 208 | * @brief Reimplemented for internal purposes. |
209 | */ | 209 | */ |
210 | void resizeEvent( QResizeEvent * ); | 210 | void resizeEvent( QResizeEvent * ); |
211 | 211 | ||
212 | private: | 212 | private: |
213 | OTabInfoList tabs; | 213 | OTabInfoList tabs; |
214 | OTabInfo *currTab; | 214 | OTabInfo *currTab; |
215 | 215 | ||
216 | TabStyle tabBarStyle; | 216 | TabStyle tabBarStyle; |
217 | TabPosition tabBarPosition; | 217 | TabPosition tabBarPosition; |
218 | 218 | ||
219 | QWidgetStack *tabBarStack; | 219 | QWidgetStack *tabBarStack; |
220 | OTabBar *tabBar; | 220 | OTabBar *tabBar; |
221 | QComboBox *tabList; | 221 | QComboBox *tabList; |
222 | 222 | ||
223 | QWidgetStack *widgetStack; | 223 | QWidgetStack *widgetStack; |
224 | class Private; | ||
225 | Private* d; | ||
224 | 226 | ||
225 | /** | 227 | /** |
226 | * @fn loadSmooth( const QString &name ) | 228 | * @fn loadSmooth( const QString &name ) |
227 | * @brief Loads icon for widget. | 229 | * @brief Loads icon for widget. |
228 | * | 230 | * |
229 | * @param name Name of icon image file. | 231 | * @param name Name of icon image file. |
230 | */ | 232 | */ |
231 | QPixmap loadSmooth( const QString & ); | 233 | QPixmap loadSmooth( const QString & ); |
232 | 234 | ||
233 | /** | 235 | /** |
234 | * @fn selectTab( OTabInfo *tab ) | 236 | * @fn selectTab( OTabInfo *tab ) |
235 | * @brief Internal function to select desired widget. | 237 | * @brief Internal function to select desired widget. |
236 | * | 238 | * |
237 | * @param tab Pointer to data for widget. | 239 | * @param tab Pointer to data for widget. |
238 | */ | 240 | */ |
239 | void selectTab( OTabInfo * ); | 241 | void selectTab( OTabInfo * ); |
240 | 242 | ||
241 | /** | 243 | /** |
242 | * @fn setUpLayout() | 244 | * @fn setUpLayout() |
243 | * @brief Internal function to adjust layout. | 245 | * @brief Internal function to adjust layout. |
244 | */ | 246 | */ |
245 | void setUpLayout(); | 247 | void setUpLayout(); |
246 | 248 | ||
247 | 249 | ||
248 | signals: | 250 | signals: |
249 | /** | 251 | /** |
250 | * @fn currentChanegd( QWidget *widget ) | 252 | * @fn currentChanegd( QWidget *widget ) |
251 | * @brief This signal is emitted whenever the widget has changed. | 253 | * @brief This signal is emitted whenever the widget has changed. |
252 | * | 254 | * |
253 | * @param widget Pointer to new current widget. | 255 | * @param widget Pointer to new current widget. |
254 | */ | 256 | */ |
255 | void currentChanged( QWidget * ); | 257 | void currentChanged( QWidget * ); |
256 | 258 | ||
257 | private slots: | 259 | private slots: |
258 | 260 | ||
259 | /** | 261 | /** |
260 | * @fn slotTabBarSelected( int id ) | 262 | * @fn slotTabBarSelected( int id ) |
261 | * @brief Slot which is called when a tab is selected. | 263 | * @brief Slot which is called when a tab is selected. |
262 | * | 264 | * |
263 | * @param id ID of widget selected. | 265 | * @param id ID of widget selected. |
264 | */ | 266 | */ |
265 | void slotTabBarSelected( int ); | 267 | void slotTabBarSelected( int ); |
266 | 268 | ||
267 | /** | 269 | /** |
268 | * @fn slotTabListSelected( int index ) | 270 | * @fn slotTabListSelected( int index ) |
269 | * @brief Slot which is called when a drop down selection is made. | 271 | * @brief Slot which is called when a drop down selection is made. |
270 | * | 272 | * |
271 | * @param id Index of widget selected. | 273 | * @param id Index of widget selected. |
diff --git a/libopie/oticker.h b/libopie/oticker.h index c848654..c52e317 100644 --- a/libopie/oticker.h +++ b/libopie/oticker.h | |||
@@ -41,96 +41,97 @@ | |||
41 | #include <qframe.h> | 41 | #include <qframe.h> |
42 | #include <qcolor.h> | 42 | #include <qcolor.h> |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * @class OTicker | 45 | * @class OTicker |
46 | * @brief The OTicker class provides a QLabel widget that scroll its contents | 46 | * @brief The OTicker class provides a QLabel widget that scroll its contents |
47 | * | 47 | * |
48 | */ | 48 | */ |
49 | class OTicker : public QLabel { | 49 | class OTicker : public QLabel { |
50 | Q_OBJECT | 50 | Q_OBJECT |
51 | 51 | ||
52 | public: | 52 | public: |
53 | 53 | ||
54 | /*! | 54 | /*! |
55 | * @fn OTicker( QWidget* parent = 0 ) | 55 | * @fn OTicker( QWidget* parent = 0 ) |
56 | * @brief Object constructor. | 56 | * @brief Object constructor. |
57 | * | 57 | * |
58 | * @param parent Pointer to parent of this control. | 58 | * @param parent Pointer to parent of this control. |
59 | 59 | ||
60 | * Constructs a new OTicker control with parent | 60 | * Constructs a new OTicker control with parent |
61 | */ | 61 | */ |
62 | OTicker( QWidget* parent=0 ); | 62 | OTicker( QWidget* parent=0 ); |
63 | /*! | 63 | /*! |
64 | * @fn ~OTicker() | 64 | * @fn ~OTicker() |
65 | * @brief Object destructor. | 65 | * @brief Object destructor. |
66 | */ | 66 | */ |
67 | ~OTicker(); | 67 | ~OTicker(); |
68 | /*! | 68 | /*! |
69 | * @fn setText(const QString& ) | 69 | * @fn setText(const QString& ) |
70 | * @brief sets text to be displayed | 70 | * @brief sets text to be displayed |
71 | * @param text QString text to be displayed. | 71 | * @param text QString text to be displayed. |
72 | * | 72 | * |
73 | */ | 73 | */ |
74 | void setText( const QString& text ) ; | 74 | void setText( const QString& text ) ; |
75 | /*! | 75 | /*! |
76 | * @fn setBackgroundColor(QColor color) | 76 | * @fn setBackgroundColor(QColor color) |
77 | * @brief sets color of the ticker's background | 77 | * @brief sets color of the ticker's background |
78 | * @param color QColor color to be set. | 78 | * @param color QColor color to be set. |
79 | * | 79 | * |
80 | */ | 80 | */ |
81 | //FIXME const QColor& please -zecke | 81 | //FIXME const QColor& please -zecke |
82 | void setBackgroundColor(QColor color); | 82 | void setBackgroundColor(QColor color); |
83 | /*! | 83 | /*! |
84 | * @fn setForegroundColor(QColor color) | 84 | * @fn setForegroundColor(QColor color) |
85 | * @brief sets color of text | 85 | * @brief sets color of text |
86 | * @param color QColor color of text | 86 | * @param color QColor color of text |
87 | * | 87 | * |
88 | */ | 88 | */ |
89 | // FIXME const QColor& please -zecke | ||
89 | void setForegroundColor(QColor color); | 90 | void setForegroundColor(QColor color); |
90 | /*! | 91 | /*! |
91 | * @fn setFrame(int style) | 92 | * @fn setFrame(int style) |
92 | * @brief sets frame style | 93 | * @brief sets frame style |
93 | * @param style int Frame style to be see. See Qt::WidgetFlags. | 94 | * @param style int Frame style to be see. See Qt::WidgetFlags. |
94 | * | 95 | * |
95 | */ | 96 | */ |
96 | void setFrame(int style); | 97 | void setFrame(int style); |
97 | /*! | 98 | /*! |
98 | * @fn setUpdateTime(int timeout) | 99 | * @fn setUpdateTime(int timeout) |
99 | * @brief sets time of update | 100 | * @brief sets time of update |
100 | * @param timeout int time in milliseconds between updates. | 101 | * @param timeout int time in milliseconds between updates. |
101 | * | 102 | * |
102 | */ | 103 | */ |
103 | void setUpdateTime(int timeout); | 104 | void setUpdateTime(int timeout); |
104 | /*! | 105 | /*! |
105 | * @fn setScrollLength(int length) | 106 | * @fn setScrollLength(int length) |
106 | * @brief sets amount of scrolling default is 1 | 107 | * @brief sets amount of scrolling default is 1 |
107 | * @param length int scroll length. | 108 | * @param length int scroll length. |
108 | * | 109 | * |
109 | */ | 110 | */ |
110 | void setScrollLength(int length); | 111 | void setScrollLength(int length); |
111 | signals: | 112 | signals: |
112 | /*! | 113 | /*! |
113 | * @fn mousePressed() | 114 | * @fn mousePressed() |
114 | * @brief signal mouse press event | 115 | * @brief signal mouse press event |
115 | * | 116 | * |
116 | */ | 117 | */ |
117 | void mousePressed(); | 118 | void mousePressed(); |
118 | protected: | 119 | protected: |
119 | /*! | 120 | /*! |
120 | * @fn timerEvent( QTimerEvent * e) | 121 | * @fn timerEvent( QTimerEvent * e) |
121 | * @brief timer timeout event | 122 | * @brief timer timeout event |
122 | * @param e QEvent see QEvent. | 123 | * @param e QEvent see QEvent. |
123 | * | 124 | * |
124 | */ | 125 | */ |
125 | void timerEvent( QTimerEvent * e); | 126 | void timerEvent( QTimerEvent * e); |
126 | /*! | 127 | /*! |
127 | * @fn drawContents( QPainter *p ) | 128 | * @fn drawContents( QPainter *p ) |
128 | * @brief draws widget contents | 129 | * @brief draws widget contents |
129 | * @param p QPainter. see QPainter | 130 | * @param p QPainter. see QPainter |
130 | * | 131 | * |
131 | */ | 132 | */ |
132 | void drawContents( QPainter *p ); | 133 | void drawContents( QPainter *p ); |
133 | /*! | 134 | /*! |
134 | * @fn mouseReleaseEvent( QMouseEvent *e) | 135 | * @fn mouseReleaseEvent( QMouseEvent *e) |
135 | * @brief mouse release event | 136 | * @brief mouse release event |
136 | * @param e QMouseEvent. see QMouseEvent. | 137 | * @param e QMouseEvent. see QMouseEvent. |
diff --git a/libopie/otimepicker.h b/libopie/otimepicker.h index d501a95..6a9e040 100644 --- a/libopie/otimepicker.h +++ b/libopie/otimepicker.h | |||
@@ -32,50 +32,52 @@ class OTimePicker: public QWidget { | |||
32 | void setMinute(int m); | 32 | void setMinute(int m); |
33 | void setTime( const QTime& ); | 33 | void setTime( const QTime& ); |
34 | void setTime( int h, int m ); | 34 | void setTime( int h, int m ); |
35 | 35 | ||
36 | public: | 36 | public: |
37 | QTime time()const; | 37 | QTime time()const; |
38 | 38 | ||
39 | private: | 39 | private: |
40 | QValueList<OClickableLabel *> hourLst; | 40 | QValueList<OClickableLabel *> hourLst; |
41 | QValueList<OClickableLabel *> minuteLst; | 41 | QValueList<OClickableLabel *> minuteLst; |
42 | QTime tm; | 42 | QTime tm; |
43 | struct Private; | 43 | struct Private; |
44 | Private *d; | 44 | Private *d; |
45 | 45 | ||
46 | private slots: | 46 | private slots: |
47 | void slotHour(bool b); | 47 | void slotHour(bool b); |
48 | void slotMinute(bool b); | 48 | void slotMinute(bool b); |
49 | 49 | ||
50 | signals: | 50 | signals: |
51 | /** | 51 | /** |
52 | * gets emitted when the time got changed by the user | 52 | * gets emitted when the time got changed by the user |
53 | */ | 53 | */ |
54 | void timeChanged(const QTime &); | 54 | void timeChanged(const QTime &); |
55 | }; | 55 | }; |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * | 58 | * |
59 | * @short A small dialog to pick a time | 59 | * @short A small dialog to pick a time |
60 | * @version 1.0 | 60 | * @version 1.0 |
61 | * @author Stefan Eilers | 61 | * @author Stefan Eilers |
62 | */ | 62 | */ |
63 | 63 | ||
64 | class OTimePickerDialog: public OTimePickerDialogBase { | 64 | class OTimePickerDialog: public OTimePickerDialogBase { |
65 | Q_OBJECT | 65 | Q_OBJECT |
66 | 66 | ||
67 | public: | 67 | public: |
68 | OTimePickerDialog ( QWidget* parent = 0, const char* name = NULL, WFlags fl = 0 ); | 68 | OTimePickerDialog ( QWidget* parent = 0, const char* name = NULL, WFlags fl = 0 ); |
69 | ~OTimePickerDialog() { }; | 69 | ~OTimePickerDialog() { }; |
70 | 70 | ||
71 | QTime time()const; | 71 | QTime time()const; |
72 | 72 | ||
73 | public slots: | 73 | public slots: |
74 | void setTime( const QTime& time ); | 74 | void setTime( const QTime& time ); |
75 | void setHour( const QString& hour ); | 75 | void setHour( const QString& hour ); |
76 | void setMinute( const QString& minute ); | 76 | void setMinute( const QString& minute ); |
77 | 77 | ||
78 | private: | 78 | private: |
79 | QTime m_time; | 79 | QTime m_time; |
80 | class Private; | ||
81 | Private* d; | ||
80 | }; | 82 | }; |
81 | #endif | 83 | #endif |
diff --git a/libopie/owait.h b/libopie/owait.h index 6217e31..cbfc8d6 100644 --- a/libopie/owait.h +++ b/libopie/owait.h | |||
@@ -1,74 +1,77 @@ | |||
1 | /* This file is part of the OPIE libraries | 1 | /* This file is part of the OPIE libraries |
2 | Copyright (C) 2003 Maximilian Reiss (harlekin@handhelds.org) | 2 | Copyright (C) 2003 Maximilian Reiss (harlekin@handhelds.org) |
3 | 3 | ||
4 | This library is free software; you can redistribute it and/or | 4 | This library is free software; you can redistribute it and/or |
5 | modify it under the terms of the GNU Library General Public | 5 | modify it under the terms of the GNU Library General Public |
6 | License as published by the Free Software Foundation; either | 6 | License as published by the Free Software Foundation; either |
7 | version 2 of the License, or (at your option) any later version. | 7 | version 2 of the License, or (at your option) any later version. |
8 | 8 | ||
9 | This library is distributed in the hope that it will be useful, | 9 | This library is distributed in the hope that it will be useful, |
10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 | Library General Public License for more details. | 12 | Library General Public License for more details. |
13 | 13 | ||
14 | You should have received a copy of the GNU Library General Public License | 14 | You should have received a copy of the GNU Library General Public License |
15 | along with this library; see the file COPYING.LIB. If not, write to | 15 | along with this library; see the file COPYING.LIB. If not, write to |
16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 16 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
17 | Boston, MA 02111-1307, USA. | 17 | Boston, MA 02111-1307, USA. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | 20 | ||
21 | 21 | ||
22 | #ifndef WAITPOPUP_H | 22 | #ifndef WAITPOPUP_H |
23 | #define WAITPOPUP_H | 23 | #define WAITPOPUP_H |
24 | 24 | ||
25 | #include <qdialog.h> | 25 | #include <qdialog.h> |
26 | #include <qpixmap.h> | 26 | #include <qpixmap.h> |
27 | #include <qlabel.h> | 27 | #include <qlabel.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * This class displays a animated waiting icon in the middle of the screen. | 31 | * This class displays a animated waiting icon in the middle of the screen. |
32 | * | 32 | * |
33 | * @short modal hour glass dialog | 33 | * @short modal hour glass dialog |
34 | * @see QDialog | 34 | * @see QDialog |
35 | * @author Maximilian Reiß | 35 | * @author Maximilian Reiß |
36 | */ | 36 | */ |
37 | class OWait : public QDialog { | 37 | class OWait : public QDialog { |
38 | 38 | ||
39 | Q_OBJECT | 39 | Q_OBJECT |
40 | 40 | ||
41 | public: | 41 | public: |
42 | // FIXME Wflags -zecke? | ||
42 | OWait(QWidget *parent=0,const char* name=0, bool dispIcon=TRUE); | 43 | OWait(QWidget *parent=0,const char* name=0, bool dispIcon=TRUE); |
43 | ~OWait(); | 44 | ~OWait(); |
44 | 45 | ||
45 | /** | 46 | /** |
46 | * reimplemented for control reasons | 47 | * reimplemented for control reasons |
47 | */ | 48 | */ |
48 | void show(); | 49 | void show(); |
49 | 50 | ||
50 | /** | 51 | /** |
51 | * Set the time before the icon will be automaticly hidden | 52 | * Set the time before the icon will be automaticly hidden |
52 | * The timer will be started once the widget will be shown. | 53 | * The timer will be started once the widget will be shown. |
53 | * @param length - time in seconds | 54 | * @param length - time in seconds |
54 | */ | 55 | */ |
55 | void setTimerLength( int length ); | 56 | void setTimerLength( int length ); |
56 | 57 | ||
57 | public slots: | 58 | public slots: |
58 | /** | 59 | /** |
59 | * reimplemented for control reasons | 60 | * reimplemented for control reasons |
60 | */ | 61 | */ |
61 | void hide(); | 62 | void hide(); |
62 | 63 | ||
63 | private: | 64 | private: |
64 | void timerEvent( QTimerEvent * ) ; | 65 | void timerEvent( QTimerEvent * ) ; |
65 | void paintEvent( QPaintEvent * ); | 66 | void paintEvent( QPaintEvent * ); |
66 | 67 | ||
67 | QPixmap m_pix; | 68 | QPixmap m_pix; |
68 | QLabel *m_lb; | 69 | QLabel *m_lb; |
69 | QTimer *m_waitTimer; | 70 | QTimer *m_waitTimer; |
70 | int m_timerLength; | 71 | int m_timerLength; |
71 | int m_aniSize; | 72 | int m_aniSize; |
73 | class Private; | ||
74 | Private *d; | ||
72 | }; | 75 | }; |
73 | 76 | ||
74 | #endif | 77 | #endif |
diff --git a/libopie/pim/otodoaccess.h b/libopie/pim/otodoaccess.h index 2bb87dc..a626731 100644 --- a/libopie/pim/otodoaccess.h +++ b/libopie/pim/otodoaccess.h | |||
@@ -31,57 +31,60 @@ public: | |||
31 | */ | 31 | */ |
32 | OTodoAccess( OTodoAccessBackend* = 0l, enum Access acc = Random ); | 32 | OTodoAccess( OTodoAccessBackend* = 0l, enum Access acc = Random ); |
33 | ~OTodoAccess(); | 33 | ~OTodoAccess(); |
34 | 34 | ||
35 | 35 | ||
36 | /* our functions here */ | 36 | /* our functions here */ |
37 | /** | 37 | /** |
38 | * include todos from start to end | 38 | * include todos from start to end |
39 | * includeNoDates whether or not to include | 39 | * includeNoDates whether or not to include |
40 | * events with no dates | 40 | * events with no dates |
41 | */ | 41 | */ |
42 | List effectiveToDos( const QDate& start, | 42 | List effectiveToDos( const QDate& start, |
43 | const QDate& end, | 43 | const QDate& end, |
44 | bool includeNoDates = true ); | 44 | bool includeNoDates = true ); |
45 | 45 | ||
46 | /** | 46 | /** |
47 | * start | 47 | * start |
48 | * end date taken from the currentDate() | 48 | * end date taken from the currentDate() |
49 | */ | 49 | */ |
50 | List effectiveToDos( const QDate& start, | 50 | List effectiveToDos( const QDate& start, |
51 | bool includeNoDates = true ); | 51 | bool includeNoDates = true ); |
52 | 52 | ||
53 | 53 | ||
54 | /** | 54 | /** |
55 | * return overdue OTodos | 55 | * return overdue OTodos |
56 | */ | 56 | */ |
57 | List overDue(); | 57 | List overDue(); |
58 | 58 | ||
59 | /** | 59 | /** |
60 | * | 60 | * |
61 | */ | 61 | */ |
62 | List sorted( bool ascending, int sortOrder, int sortFilter, int cat ); | 62 | List sorted( bool ascending, int sortOrder, int sortFilter, int cat ); |
63 | 63 | ||
64 | /** | 64 | /** |
65 | * merge a list of OTodos into | 65 | * merge a list of OTodos into |
66 | * the resource | 66 | * the resource |
67 | */ | 67 | */ |
68 | void mergeWith( const QValueList<OTodo>& ); | 68 | void mergeWith( const QValueList<OTodo>& ); |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * delete all already completed items | 71 | * delete all already completed items |
72 | */ | 72 | */ |
73 | void removeAllCompleted(); | 73 | void removeAllCompleted(); |
74 | 74 | ||
75 | signals: | 75 | signals: |
76 | /** | 76 | /** |
77 | * if the OTodoAccess was changed | 77 | * if the OTodoAccess was changed |
78 | */ | 78 | */ |
79 | void signalChanged( const OTodoAccess* ); | 79 | void changed( const OTodoAccess* ); |
80 | void changed( const OTodoAccess*, int uid ); | ||
81 | void added( const OTodoAccess*, int uid ); | ||
82 | void removed( const OTodoAccess*, int uid ); | ||
80 | private: | 83 | private: |
81 | int m_cat; | 84 | int m_cat; |
82 | OTodoAccessBackend* m_todoBackEnd; | 85 | OTodoAccessBackend* m_todoBackEnd; |
83 | class OTodoAccessPrivate; | 86 | class OTodoAccessPrivate; |
84 | OTodoAccessPrivate* d; | 87 | OTodoAccessPrivate* d; |
85 | }; | 88 | }; |
86 | 89 | ||
87 | #endif | 90 | #endif |
diff --git a/libopie/xmltree.h b/libopie/xmltree.h index 4a6b6d9..4b6bdfa 100644 --- a/libopie/xmltree.h +++ b/libopie/xmltree.h | |||
@@ -65,53 +65,55 @@ public: | |||
65 | /** removeChild removes the child from the XMLElement. | 65 | /** removeChild removes the child from the XMLElement. |
66 | * The ownership gets dropped. You need to delete the | 66 | * The ownership gets dropped. You need to delete the |
67 | * child yourself. | 67 | * child yourself. |
68 | */ | 68 | */ |
69 | void removeChild( XMLElement *child ); | 69 | void removeChild( XMLElement *child ); |
70 | 70 | ||
71 | /** parent() returns the parent of this XMLElement | 71 | /** parent() returns the parent of this XMLElement |
72 | * If there is no parent 0l gets returned | 72 | * If there is no parent 0l gets returned |
73 | */ | 73 | */ |
74 | XMLElement *parent() const { return m_parent; } | 74 | XMLElement *parent() const { return m_parent; } |
75 | XMLElement *firstChild() const { return m_first; } | 75 | XMLElement *firstChild() const { return m_first; } |
76 | XMLElement *nextChild() const { return m_next; } | 76 | XMLElement *nextChild() const { return m_next; } |
77 | XMLElement *prevChild() const { return m_prev; } | 77 | XMLElement *prevChild() const { return m_prev; } |
78 | XMLElement *lastChild() const { return m_last; } | 78 | XMLElement *lastChild() const { return m_last; } |
79 | 79 | ||
80 | void setTagName( const QString &tag ) { m_tag = tag; } | 80 | void setTagName( const QString &tag ) { m_tag = tag; } |
81 | QString tagName() const { return m_tag; } | 81 | QString tagName() const { return m_tag; } |
82 | 82 | ||
83 | void setValue( const QString &val ) { m_value = val; } | 83 | void setValue( const QString &val ) { m_value = val; } |
84 | QString value() const { return m_value; } | 84 | QString value() const { return m_value; } |
85 | 85 | ||
86 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } | 86 | void setAttributes( const AttributeMap &attrs ) { m_attributes = attrs; } |
87 | AttributeMap attributes() const { return m_attributes; } | 87 | AttributeMap attributes() const { return m_attributes; } |
88 | AttributeMap &attributes() { return m_attributes; } | 88 | AttributeMap &attributes() { return m_attributes; } |
89 | 89 | ||
90 | QString attribute( const QString & ) const; | 90 | QString attribute( const QString & ) const; |
91 | void setAttribute( const QString &attr, const QString &value ); | 91 | void setAttribute( const QString &attr, const QString &value ); |
92 | void save( QTextStream &stream, uint indent = 0 ); | 92 | void save( QTextStream &stream, uint indent = 0 ); |
93 | 93 | ||
94 | XMLElement *namedItem( const QString &name ); | 94 | XMLElement *namedItem( const QString &name ); |
95 | 95 | ||
96 | XMLElement *clone() const; | 96 | XMLElement *clone() const; |
97 | 97 | ||
98 | static XMLElement *load( const QString &fileName ); | 98 | static XMLElement *load( const QString &fileName ); |
99 | 99 | ||
100 | private: | 100 | private: |
101 | QString m_tag; | 101 | QString m_tag; |
102 | QString m_value; | 102 | QString m_value; |
103 | AttributeMap m_attributes; | 103 | AttributeMap m_attributes; |
104 | 104 | ||
105 | XMLElement *m_parent; | 105 | XMLElement *m_parent; |
106 | XMLElement *m_next; | 106 | XMLElement *m_next; |
107 | XMLElement *m_prev; | 107 | XMLElement *m_prev; |
108 | XMLElement *m_first; | 108 | XMLElement *m_first; |
109 | XMLElement *m_last; | 109 | XMLElement *m_last; |
110 | 110 | ||
111 | XMLElement( const XMLElement &rhs ); | 111 | XMLElement( const XMLElement &rhs ); |
112 | XMLElement &operator=( const XMLElement &rhs ); | 112 | XMLElement &operator=( const XMLElement &rhs ); |
113 | class Private; | ||
114 | Private* d; | ||
113 | }; | 115 | }; |
114 | 116 | ||
115 | } // namespace Opie | 117 | } // namespace Opie |
116 | 118 | ||
117 | #endif | 119 | #endif |