author | zecke <zecke> | 2004-02-20 17:57:01 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-20 17:57:01 (UTC) |
commit | 974c01feac1a9749497bb1df50841e35cedb63b0 (patch) (unidiff) | |
tree | 765b084e80477b36eb74b3ec64f85e70b3031707 /libopie2 | |
parent | 73c6183bb2971a117d638a8ea8b1f83016ae6fd6 (diff) | |
download | opie-974c01feac1a9749497bb1df50841e35cedb63b0.zip opie-974c01feac1a9749497bb1df50841e35cedb63b0.tar.gz opie-974c01feac1a9749497bb1df50841e35cedb63b0.tar.bz2 |
Fix the messed up header :)
Mess up the header ( #define private protected for Global. Yeah ugly )
Add default parameter to encodeBase64 to obey RFC
Handle DateFormat better
-rw-r--r-- | libopie2/opiecore/oglobal.h | 70 |
1 files changed, 44 insertions, 26 deletions
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h index 33dcb3c..d09d73e 100644 --- a/libopie2/opiecore/oglobal.h +++ b/libopie2/opiecore/oglobal.h | |||
@@ -1,40 +1,49 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> | 3 | Copyright (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | Copyright (C) 2004 Holger 'zecke' Freyther <zecke@handhelds.org> | ||
4 | =. | 5 | =. |
5 | .=l. | 6 | .=l. |
6 | .>+-= | 7 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 8 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 14 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
16 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 22 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
28 | */ | 29 | */ |
29 | 30 | ||
30 | #ifndef OGLOBAL_H | 31 | #ifndef OGLOBAL_H |
31 | #define OGLOBAL_H | 32 | #define OGLOBAL_H |
32 | 33 | ||
33 | #include <qpe/global.h> | ||
34 | #include <qpe/timestring.h> | ||
35 | 34 | ||
36 | #include <opie2/oconfig.h> | 35 | #include <opie2/oconfig.h> |
36 | |||
37 | #ifndef private | ||
38 | #define HACK_DEFINED | ||
39 | #define private protected | ||
40 | #endif | ||
41 | #include <qpe/global.h> | ||
42 | #ifdef HACK_DEFINED | ||
43 | #undef private | ||
44 | #endif | ||
45 | |||
37 | #include <sys/types.h> | 46 | #include <sys/types.h> |
38 | 47 | ||
39 | //FIXME Is it wise or even necessary to inherit OGlobal from Global? | 48 | //FIXME Is it wise or even necessary to inherit OGlobal from Global? |
40 | // once we totally skip libqpe it should ideally swallow Global -zecke | 49 | // once we totally skip libqpe it should ideally swallow Global -zecke |
@@ -42,8 +51,9 @@ _;:, .> :=|. This program is free software; you can | |||
42 | 51 | ||
43 | 52 | ||
44 | class QFile; | 53 | class QFile; |
45 | class QString; | 54 | class QString; |
55 | class DateFormat; | ||
46 | /** | 56 | /** |
47 | *\brief OGlobal contains a list of generic functions | 57 | *\brief OGlobal contains a list of generic functions |
48 | * | 58 | * |
49 | * The class OGlobal contains small utility functions | 59 | * The class OGlobal contains small utility functions |
@@ -51,8 +61,10 @@ class QString; | |||
51 | * to the global device config and specialized functions to get information | 61 | * to the global device config and specialized functions to get information |
52 | * out of this config like Weekstart or Owner name. | 62 | * out of this config like Weekstart or Owner name. |
53 | * | 63 | * |
54 | * @todo ODP implement the things from Global which are good | 64 | * @todo ODP implement the things from Global which are good |
65 | * @author mickey,alwin,zecke | ||
66 | * @version 0.1 | ||
55 | */ | 67 | */ |
56 | class OGlobal : public Global | 68 | class OGlobal : public Global |
57 | { | 69 | { |
58 | public: | 70 | public: |
@@ -83,9 +95,9 @@ public: | |||
83 | /** @name Convert Content | 95 | /** @name Convert Content |
84 | * Convert Content of a QByteArray | 96 | * Convert Content of a QByteArray |
85 | */ | 97 | */ |
86 | //@{ | 98 | //@{ |
87 | static QByteArray encodeBase64(const QByteArray& ); | 99 | static QByteArray encodeBase64(const QByteArray&, bool insertLF = false ); |
88 | static QByteArray decodeBase64(const QByteArray& ); | 100 | static QByteArray decodeBase64(const QByteArray& ); |
89 | //@} | 101 | //@} |
90 | 102 | ||
91 | //FIXME Do we want to put that into OApplication as in KApplication? -zecke | 103 | //FIXME Do we want to put that into OApplication as in KApplication? -zecke |
@@ -106,14 +118,20 @@ public: | |||
106 | * See if we need to use the function with String in it | 118 | * See if we need to use the function with String in it |
107 | * Anyway this is the future | 119 | * Anyway this is the future |
108 | * for now still use TimeString! | 120 | * for now still use TimeString! |
109 | */ | 121 | */ |
110 | static DateFormat dateFormat(); | ||
111 | #endif | 122 | #endif |
123 | static DateFormat dateFormat(); | ||
124 | static void setDateFormat( const DateFormat& ); | ||
125 | |||
112 | 126 | ||
113 | static void setWeekStartsOnMonday( bool ); | 127 | static void setWeekStartsOnMonday( bool ); |
114 | static void setUseAMPM( bool ); | 128 | static void setUseAMPM( bool ); |
115 | static void setDateFormat( const DateFormat& ); | 129 | //@} |
130 | |||
131 | //@{ | ||
132 | static Global::Command* builtinCommands(); | ||
133 | static QGuardedPtr<QWidget>* builtinRunning(); | ||
116 | //@} | 134 | //@} |
117 | 135 | ||
118 | private: | 136 | private: |
119 | static OConfig* _config; | 137 | static OConfig* _config; |