mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-05-05 13:14:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better comment parsing in keyboard binding files.

Browse Source 
svn path=/trunk/KDE/kdebase/apps/konsole/; revision=808721
This commit is contained in:
Robert Knight
2008-05-17 12:23:55 +00:00
parent 6c9ae440f7
commit cc78f9909b
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/KeyboardTranslator.cpp
View File

@@ -494,10 +494,24 @@ bool KeyboardTranslatorReader::parseError()
}
QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const QString& line)
{
QString text = line.simplified();
QString text = line;
// comment line: # comment
static QRegExp comment("\\#.*");
// remove comments
bool inQuotes = false;
int commentPos = -1;
for (int i=text.length()-1;i>=0;i--)
{
QChar ch = text[i];
if (ch == '\"')
inQuotes = !inQuotes;
else if (ch == '#' && !inQuotes)
commentPos = i;
}
if (commentPos != -1)
text.remove(commentPos,text.length());
text = text.simplified();
// title line: keyboard "title"
static QRegExp title("keyboard\\s+\"(.*)\"");
// key line: key KeySequence : "output"
@@ -505,8 +519,7 @@ QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const
static QRegExp key("key\\s+([\\w\\+\\s\\-]+)\\s*:\\s*(\"(.*)\"|\\w+)");
QList<Token> list;
if ( text.isEmpty() || comment.exactMatch(text) )
if ( text.isEmpty() )
{
return list;
}