| -rw-r--r-- | inputmethods/pickboard/pickboardcfg.cpp | 10 | ||||
| -rw-r--r-- | inputmethods/pickboard/pickboardcfg.h | 2 |
2 files changed, 6 insertions, 6 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 @@ -155,16 +155,16 @@ void StringConfig::draw(QPainter* p) 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; } } } @@ -428,16 +428,16 @@ void DictFilterConfig::pick(bool press, int row, int item) 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 { diff --git a/inputmethods/pickboard/pickboardcfg.h b/inputmethods/pickboard/pickboardcfg.h index e0dc0dd..b1913df 100644 --- a/inputmethods/pickboard/pickboardcfg.h +++ b/inputmethods/pickboard/pickboardcfg.h @@ -109,13 +109,13 @@ public: void draw(QPainter* p); protected: virtual QString text(int r, int i)=0; virtual bool spreadRow(int i)=0; - virtual QColor rowColor(int) { return Qt::black; } + virtual QColor rowColor(int) { return ::Qt::black; } virtual void pickInRow(int r, int xpos, bool press); virtual void updateItem(int r, int i); virtual bool highlight(int,int) const; }; class CharStringConfig : public StringConfig { |