author | mickeyl <mickeyl> | 2003-09-25 18:11:23 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-09-25 18:11:23 (UTC) |
commit | 2d97604243f83dc7d057656148112c8018677bba (patch) (unidiff) | |
tree | eee78eff5aa141bd55214fa0ba6dca8fad83091a | |
parent | 9047b6d4ffe0cbcecd90fd994ce2353277c378a1 (diff) | |
download | opie-2d97604243f83dc7d057656148112c8018677bba.zip opie-2d97604243f83dc7d057656148112c8018677bba.tar.gz opie-2d97604243f83dc7d057656148112c8018677bba.tar.bz2 |
fix tille's infinite recursion ;-)
-rw-r--r-- | libopie2/opiecore/oconfig.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h index e7d3be6..75aa170 100644 --- a/libopie2/opiecore/oconfig.h +++ b/libopie2/opiecore/oconfig.h | |||
@@ -34,65 +34,65 @@ | |||
34 | 34 | ||
35 | //FIXME: Implement for X11 or reuse libqpe/Config there also? | 35 | //FIXME: Implement for X11 or reuse libqpe/Config there also? |
36 | //FIXME: Or rather use QSettings also for libqpe? | 36 | //FIXME: Or rather use QSettings also for libqpe? |
37 | 37 | ||
38 | #include "opieconfig.h" | 38 | #include "opieconfig.h" |
39 | 39 | ||
40 | class QColor; | 40 | class QColor; |
41 | class QFont; | 41 | class QFont; |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * A Configuration class based on the Qtopia @ref Config class | 44 | * A Configuration class based on the Qtopia @ref Config class |
45 | * featuring additional handling of color and font entries | 45 | * featuring additional handling of color and font entries |
46 | */ | 46 | */ |
47 | 47 | ||
48 | class OConfig : public OpieConfig | 48 | class OConfig : public OpieConfig |
49 | { | 49 | { |
50 | public: | 50 | public: |
51 | /** | 51 | /** |
52 | * Constructs a OConfig object with a @a name. | 52 | * Constructs a OConfig object with a @a name. |
53 | */ | 53 | */ |
54 | OConfig( const QString &name, Domain domain = User ); | 54 | OConfig( const QString &name, Domain domain = User ); |
55 | /** | 55 | /** |
56 | * Destructs the OConfig object. | 56 | * Destructs the OConfig object. |
57 | * | 57 | * |
58 | * Writes back any dirty configuration entries, and destroys | 58 | * Writes back any dirty configuration entries, and destroys |
59 | * dynamically created objects. | 59 | * dynamically created objects. |
60 | */ | 60 | */ |
61 | virtual ~OConfig(); | 61 | virtual ~OConfig(); |
62 | /** | 62 | /** |
63 | * @returns the name of the current group. | 63 | * @returns the name of the current group. |
64 | * The current group is used for searching keys and accessing entries. | 64 | * The current group is used for searching keys and accessing entries. |
65 | */ | 65 | */ |
66 | const QString& group() { return group(); }; | 66 | const QString& group() { return OpieConfig::group(); }; |
67 | /** | 67 | /** |
68 | * @returns a @ref QColor entry or a @a default value if the key is not found. | 68 | * @returns a @ref QColor entry or a @a default value if the key is not found. |
69 | */ | 69 | */ |
70 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; | 70 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; |
71 | /** | 71 | /** |
72 | * @returns a @ref QFont value or a @a default value if the key is not found. | 72 | * @returns a @ref QFont value or a @a default value if the key is not found. |
73 | */ | 73 | */ |
74 | QFont readFontEntry( const QString& key, const QFont* pDefault ) const; | 74 | QFont readFontEntry( const QString& key, const QFont* pDefault ) const; |
75 | }; | 75 | }; |
76 | 76 | ||
77 | /** | 77 | /** |
78 | * @brief Helper class for easier use of OConfig groups. | 78 | * @brief Helper class for easier use of OConfig groups. |
79 | * | 79 | * |
80 | * Careful programmers always set the group of a | 80 | * Careful programmers always set the group of a |
81 | * @ref OConfig object to the group they want to read from | 81 | * @ref OConfig object to the group they want to read from |
82 | * and set it back to the old one of afterwards. This is usually | 82 | * and set it back to the old one of afterwards. This is usually |
83 | * written as: | 83 | * written as: |
84 | * <pre> | 84 | * <pre> |
85 | * | 85 | * |
86 | * QString oldgroup config()->group(); | 86 | * QString oldgroup config()->group(); |
87 | * config()->setGroup( "TheGroupThatIWant" ); | 87 | * config()->setGroup( "TheGroupThatIWant" ); |
88 | * ... | 88 | * ... |
89 | * config()->writeEntry( "Blah", "Blubb" ); | 89 | * config()->writeEntry( "Blah", "Blubb" ); |
90 | * | 90 | * |
91 | * config()->setGroup( oldgroup ); | 91 | * config()->setGroup( oldgroup ); |
92 | * </pre> | 92 | * </pre> |
93 | * | 93 | * |
94 | * In order to facilitate this task, you can use | 94 | * In order to facilitate this task, you can use |
95 | * OConfigGroupSaver. Simply construct such an object ON THE STACK | 95 | * OConfigGroupSaver. Simply construct such an object ON THE STACK |
96 | * when you want to switch to a new group. Then, when the object goes | 96 | * when you want to switch to a new group. Then, when the object goes |
97 | * out of scope, the group will automatically be restored. If you | 97 | * out of scope, the group will automatically be restored. If you |
98 | * want to use several different groups within a function or method, | 98 | * want to use several different groups within a function or method, |