author | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
commit | 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 (patch) (unidiff) | |
tree | 0701eae15aa606a0211a2fccfde0eafdac69357c /noncore/apps/keyz-cfg/cfgfile.cpp | |
parent | 8d2d2664e5f544b8292806e617deb7a0e4170dc0 (diff) | |
download | opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.zip opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.gz opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.bz2 |
convert to Opie Debugging Framework
Diffstat (limited to 'noncore/apps/keyz-cfg/cfgfile.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/keyz-cfg/cfgfile.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/noncore/apps/keyz-cfg/cfgfile.cpp b/noncore/apps/keyz-cfg/cfgfile.cpp index b0dc968..81d1ee1 100644 --- a/noncore/apps/keyz-cfg/cfgfile.cpp +++ b/noncore/apps/keyz-cfg/cfgfile.cpp | |||
@@ -1,15 +1,21 @@ | |||
1 | #include <qmessagebox.h> | ||
2 | #include "cfgfile.h" | 1 | #include "cfgfile.h" |
3 | 2 | ||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | using namespace Opie::Core; | ||
6 | |||
7 | /* QT */ | ||
8 | #include <qmessagebox.h> | ||
9 | |||
4 | // CfgEntry implementation | 10 | // CfgEntry implementation |
5 | CfgEntry::CfgEntry() { | 11 | CfgEntry::CfgEntry() { |
6 | } | 12 | } |
7 | 13 | ||
8 | CfgEntry::CfgEntry(const QString& f, const QString& l): | 14 | CfgEntry::CfgEntry(const QString& f, const QString& l): |
9 | file(f), label(l) { | 15 | file(f), label(l) { |
10 | } | 16 | } |
11 | 17 | ||
12 | const QString& CfgEntry::getFile() const { | 18 | const QString& CfgEntry::getFile() const { |
13 | return file; | 19 | return file; |
14 | } | 20 | } |
15 | 21 | ||
@@ -86,36 +92,36 @@ bool CfgParser::load(QString file, CfgFile& cfg) { | |||
86 | QXmlSimpleReader reader; | 92 | QXmlSimpleReader reader; |
87 | CfgHandler p(*this); | 93 | CfgHandler p(*this); |
88 | 94 | ||
89 | reader.setErrorHandler(this); | 95 | reader.setErrorHandler(this); |
90 | reader.setContentHandler(&p); | 96 | reader.setContentHandler(&p); |
91 | 97 | ||
92 | err = ""; | 98 | err = ""; |
93 | ardelay = -1; | 99 | ardelay = -1; |
94 | arperiod = -1; | 100 | arperiod = -1; |
95 | reader.parse(is); | 101 | reader.parse(is); |
96 | 102 | ||
97 | if (!err.isEmpty()) { | 103 | if (!err.isEmpty()) { |
98 | qDebug(err); | 104 | odebug << err << oendl; |
99 | return false; | 105 | return false; |
100 | } | 106 | } |
101 | 107 | ||
102 | QMap<QString, QString>::Iterator fit, lit; | 108 | QMap<QString, QString>::Iterator fit, lit; |
103 | for(uint i = 0; i < includeList.count(); i++) { | 109 | for(uint i = 0; i < includeList.count(); i++) { |
104 | QString file = *includeList.at(i); | 110 | QString file = *includeList.at(i); |
105 | fit = includes.find(file); | 111 | fit = includes.find(file); |
106 | QString prefix = fit.data(); | 112 | QString prefix = fit.data(); |
107 | QString label = ""; | 113 | QString label = ""; |
108 | 114 | ||
109 | qDebug("include: file=" + fit.key() + ", prefix=" + fit.data()); | 115 | odebug << "include: file=" + fit.key() + ", prefix=" + fit.data() << oendl; |
110 | lit = labels.find(prefix+":*"); | 116 | lit = labels.find(prefix+":*"); |
111 | if (lit != labels.end()) { | 117 | if (lit != labels.end()) { |
112 | label = lit.data(); | 118 | label = lit.data(); |
113 | } | 119 | } |
114 | 120 | ||
115 | cfg.replaceEntry(file, label); | 121 | cfg.replaceEntry(file, label); |
116 | } | 122 | } |
117 | 123 | ||
118 | if (ardelay != -1) { | 124 | if (ardelay != -1) { |
119 | cfg.setAutorepeatDelay(ardelay); | 125 | cfg.setAutorepeatDelay(ardelay); |
120 | } | 126 | } |
121 | 127 | ||