| author | mickeyl <mickeyl> | 2004-04-24 15:46:03 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-04-24 15:46:03 (UTC) |
| commit | f7b5905d990f374dd6cb177b7a03628cc593b7cf (patch) (side-by-side diff) | |
| tree | d4b2dc324fc54131dea3460462850cec786b8a88 /inputmethods | |
| parent | 186c4d03ea8bf3aee4c535453409f1234442bff3 (diff) | |
| download | opie-f7b5905d990f374dd6cb177b7a03628cc593b7cf.zip opie-f7b5905d990f374dd6cb177b7a03628cc593b7cf.tar.gz opie-f7b5905d990f374dd6cb177b7a03628cc593b7cf.tar.bz2 | |
gcc 3.4 fixes
| -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 @@ -159,8 +159,8 @@ void StringConfig::draw(QPainter* p) 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); @@ -432,8 +432,8 @@ void DictFilterConfig::pick(bool press, int row, int item) } 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); 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 @@ -113,5 +113,5 @@ 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); |