Diffstat (limited to 'inputmethods/pickboard/pickboardcfg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/pickboard/pickboardcfg.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/inputmethods/pickboard/pickboardcfg.cpp b/inputmethods/pickboard/pickboardcfg.cpp index e8b47cb..d500266 100644 --- a/inputmethods/pickboard/pickboardcfg.cpp +++ b/inputmethods/pickboard/pickboardcfg.cpp @@ -149,28 +149,28 @@ void StringConfig::draw(QPainter* p) for (; !(s=text(r,i)).isNull(); ++i) { int w = fm.width(s); tw += w; } bool spread = spreadRow(r);// && parent->width() > tw; int xw = spread ? (parent->width()-tw)/(i-1) : 3; int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2; i=0; for (; !(s=text(r,i)).isNull(); ++i) { int w = fm.width(s)+xw; if ( highlight(r,i) ) { - p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),Qt::black); - p->setPen(Qt::white); + p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),::Qt::black); + p->setPen(::Qt::white); }else{ - p->setPen(Qt::black); + p->setPen(::Qt::black); } p->drawText(x,-fm.descent()-1,s); x += w; } } } void StringConfig::pickInRow(int r, int xpos, bool press) { QFontMetrics fm = parent->fontMetrics(); int tw=0; @@ -422,28 +422,28 @@ QString DictFilterConfig::capitalize(const QString& s) void DictFilterConfig::pick(bool press, int row, int item) { if ( row == 0 ) { if ( press ) { if ( input.isEmpty() ) { lit0 = item; if ( othermodes[item] == "Space" ) { updateItem(row,item); generateText(" "); } else if ( othermodes[item] == "Back" ) { updateItem(row,item); - generateKey(Qt::Key_Backspace); + generateKey(::Qt::Key_Backspace); } else if ( othermodes[item] == "Enter" ) { updateItem(row,item); - generateKey(Qt::Key_Return); + generateKey(::Qt::Key_Return); } else if ( othermodes[item] == "Shift" ) { updateItem(row,item); shift = (shift+1)%3; } } } else { if ( !input.isEmpty() ) { input.clear(); if ( item>=0 ) { generateText(capitalize(matches[item])); } shift = 0; |