author | hash <hash> | 2002-08-22 06:47:27 (UTC) |
---|---|---|
committer | hash <hash> | 2002-08-22 06:47:27 (UTC) |
commit | 4ed706f6a327e06403e1def058b7290dcde3e634 (patch) (side-by-side diff) | |
tree | b31268a6673791d4163712d83592750345a1c672 | |
parent | ee8b169221775d527fdf76947503e870dfef63aa (diff) | |
download | opie-4ed706f6a327e06403e1def058b7290dcde3e634.zip opie-4ed706f6a327e06403e1def058b7290dcde3e634.tar.gz opie-4ed706f6a327e06403e1def058b7290dcde3e634.tar.bz2 |
comments behind shift and meta key map definitions wasnt working...
-rw-r--r-- | inputmethods/multikey/keyboard.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp index 74c99c7..1c17172 100644 --- a/inputmethods/multikey/keyboard.cpp +++ b/inputmethods/multikey/keyboard.cpp @@ -1036,24 +1036,27 @@ void Keys::setKeysFromFile(const char * filename) { int row; int qcode; ushort unicode; int width; QString buf; QString comment; char * xpm[256]; //couldnt be larger than that... could it? QPixmap *xpm2pix = 0; buf = t.readLine(); while (buf) { + // get rid of comments + buf.replace(QRegExp("#.*$", FALSE, FALSE), ""); + // key definition if (buf.contains(QRegExp("^\\d+\\s+[0-1a-fx]+", FALSE, FALSE))) { // no $1 type referencing!!! this implementation of regexp sucks // dont know of any sscanf() type funcs in Qt lib QTextStream tmp (buf, IO_ReadOnly); tmp >> row >> qcode >> unicode >> width >> comment; buf = t.readLine(); int xpmLineCount = 0; xpm2pix = 0; |