-rw-r--r-- | libopie2/opiecore/oapplication.h | 2 | ||||
-rw-r--r-- | libopie2/opiecore/oconfig.h | 55 | ||||
-rw-r--r-- | libopie2/opienet/omanufacturerdb.cpp | 6 |
3 files changed, 20 insertions, 43 deletions
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index 1bd34e2..6bc2b1c 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h | |||
@@ -66,3 +66,3 @@ class OApplication: public QPEApplication | |||
66 | */ | 66 | */ |
67 | static const OApplication* oApplication() { return _instance; }; | 67 | static OApplication* oApplication() { return _instance; }; |
68 | /** | 68 | /** |
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h index afe14b1..444d280 100644 --- a/libopie2/opiecore/oconfig.h +++ b/libopie2/opiecore/oconfig.h | |||
@@ -35,2 +35,3 @@ | |||
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 | 37 | ||
@@ -49,10 +50,6 @@ class OConfig : public Config | |||
49 | public: | 50 | public: |
50 | |||
51 | /** | 51 | /** |
52 | * Constructs a OConfig object. | 52 | * Constructs a OConfig object with a @a name. |
53 | * | ||
54 | * @param name A file to parse. | ||
55 | */ | 53 | */ |
56 | OConfig( const QString &name, Domain domain = User ); | 54 | OConfig( const QString &name, Domain domain = User ); |
57 | |||
58 | /** | 55 | /** |
@@ -64,37 +61,15 @@ class OConfig : public Config | |||
64 | virtual ~OConfig(); | 61 | virtual ~OConfig(); |
65 | |||
66 | /** | 62 | /** |
67 | * Returns the name of the group in which we are | 63 | * @returns the name of the current group. |
68 | * searching for keys and from which we are retrieving entries. | 64 | * The current group is used for searching keys and accessing entries. |
69 | * | ||
70 | * @return The current group. | ||
71 | */ | 65 | */ |
72 | const QString& group() { return git.key(); }; | 66 | const QString& group() { return git.key(); }; |
73 | |||
74 | /** | 67 | /** |
75 | * Reads a @ref QColor entry. | 68 | * @returns a @ref QColor entry or a @a default value if the key is not found. |
76 | * | ||
77 | * Read the value of an entry specified by @p pKey in the current group | ||
78 | * and interpret it as a color. | ||
79 | * | ||
80 | * @param pKey The key to search for. | ||
81 | * @param pDefault A default value (null QColor by default) returned if the | ||
82 | * key was not found or if the value cannot be interpreted. | ||
83 | * @return The value for this key. | ||
84 | */ | 69 | */ |
85 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; | 70 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; |
86 | |||
87 | /** | 71 | /** |
88 | * Reads a @ref QFont value. | 72 | * @returns a @ref QFont value or a @a default value if the key is not found. |
89 | * | ||
90 | * Read the value of an entry specified by @p pKey in the current group | ||
91 | * and interpret it as a font object. | ||
92 | * | ||
93 | * @param pKey The key to search for. | ||
94 | * @param pDefault A default value (null QFont by default) returned if the | ||
95 | * key was not found or if the read value cannot be interpreted. | ||
96 | * @return The value for this key. | ||
97 | */ | 73 | */ |
98 | QFont readFontEntry( const QString& key, const QFont* pDefault ) const; | 74 | QFont readFontEntry( const QString& key, const QFont* pDefault ) const; |
99 | |||
100 | }; | 75 | }; |
@@ -102,4 +77,3 @@ class OConfig : public Config | |||
102 | /** | 77 | /** |
103 | * Helper class to facilitate working with @ref OConfig / @ref OSimpleConfig | 78 | * @brief Helper class for easier use of OConfig groups. |
104 | * groups. | ||
105 | * | 79 | * |
@@ -131,3 +105,2 @@ class OConfig : public Config | |||
131 | * @see OConfig | 105 | * @see OConfig |
132 | * @short Helper class for easier use of OConfig groups | ||
133 | */ | 106 | */ |
@@ -138,8 +111,5 @@ class OConfigGroupSaver | |||
138 | /** | 111 | /** |
139 | * Constructor. You pass a pointer to the OConfigBase-derived | 112 | * Constructor. |
140 | * object you want to work with and a string indicating the _new_ | 113 | * Create the object giving a @config object and a @a group to become |
141 | * group. | 114 | * the current group. |
142 | * @param config The OConfig-derived object this | ||
143 | * OConfigGroupSaver works on. | ||
144 | * @param group The new group that the config object should switch to. | ||
145 | */ | 115 | */ |
@@ -153,3 +123,6 @@ class OConfigGroupSaver | |||
153 | { _config->setGroup( group ); } | 123 | { _config->setGroup( group ); } |
154 | 124 | /** | |
125 | * Destructor. | ||
126 | * Restores the last current group. | ||
127 | */ | ||
155 | ~OConfigGroupSaver() { _config->setGroup( _oldgroup ); } | 128 | ~OConfigGroupSaver() { _config->setGroup( _oldgroup ); } |
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp index c185fc5..c3c213c 100644 --- a/libopie2/opienet/omanufacturerdb.cpp +++ b/libopie2/opienet/omanufacturerdb.cpp | |||
@@ -17,3 +17,3 @@ | |||
17 | 17 | ||
18 | // Qt | 18 | /* QT */ |
19 | #include <qstring.h> | 19 | #include <qstring.h> |
@@ -83,3 +83,5 @@ OManufacturerDB::OManufacturerDB() | |||
83 | extManu = s.readLine(); | 83 | extManu = s.readLine(); |
84 | #ifdef DEBUG | ||
84 | qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu ); | 85 | qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu ); |
86 | #endif | ||
85 | manufacturersExt.insert( addr, extManu ); | 87 | manufacturersExt.insert( addr, extManu ); |
@@ -88,3 +90,5 @@ OManufacturerDB::OManufacturerDB() | |||
88 | s.readLine(); | 90 | s.readLine(); |
91 | #ifdef DEBUG | ||
89 | qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu ); | 92 | qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu ); |
93 | #endif | ||
90 | manufacturers.insert( addr, manu ); | 94 | manufacturers.insert( addr, manu ); |