| author | mickeyl <mickeyl> | 2004-04-24 15:46:03 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-04-24 15:46:03 (UTC) |
| commit | f7b5905d990f374dd6cb177b7a03628cc593b7cf (patch) (unidiff) | |
| 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 | |||
| @@ -160,6 +160,6 @@ void StringConfig::draw(QPainter* p) | |||
| 160 | if ( highlight(r,i) ) { | 160 | if ( highlight(r,i) ) { |
| 161 | p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),Qt::black); | 161 | p->fillRect(x-xw/2,1+fm.descent()-fm.lineSpacing(),w,fm.lineSpacing(),::Qt::black); |
| 162 | p->setPen(Qt::white); | 162 | p->setPen(::Qt::white); |
| 163 | }else{ | 163 | }else{ |
| 164 | p->setPen(Qt::black); | 164 | p->setPen(::Qt::black); |
| 165 | } | 165 | } |
| @@ -433,6 +433,6 @@ void DictFilterConfig::pick(bool press, int row, int item) | |||
| 433 | updateItem(row,item); | 433 | updateItem(row,item); |
| 434 | generateKey(Qt::Key_Backspace); | 434 | generateKey(::Qt::Key_Backspace); |
| 435 | } else if ( othermodes[item] == "Enter" ) { | 435 | } else if ( othermodes[item] == "Enter" ) { |
| 436 | updateItem(row,item); | 436 | updateItem(row,item); |
| 437 | generateKey(Qt::Key_Return); | 437 | generateKey(::Qt::Key_Return); |
| 438 | } else if ( othermodes[item] == "Shift" ) { | 438 | } else if ( othermodes[item] == "Shift" ) { |
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 | |||
| @@ -114,3 +114,3 @@ protected: | |||
| 114 | virtual bool spreadRow(int i)=0; | 114 | virtual bool spreadRow(int i)=0; |
| 115 | virtual QColor rowColor(int) { return Qt::black; } | 115 | virtual QColor rowColor(int) { return ::Qt::black; } |
| 116 | virtual void pickInRow(int r, int xpos, bool press); | 116 | virtual void pickInRow(int r, int xpos, bool press); |