summaryrefslogtreecommitdiff
path: root/inputmethods
authormickeyl <mickeyl>2004-04-24 15:46:03 (UTC)
committer mickeyl <mickeyl>2004-04-24 15:46:03 (UTC)
commitf7b5905d990f374dd6cb177b7a03628cc593b7cf (patch) (unidiff)
treed4b2dc324fc54131dea3460462850cec786b8a88 /inputmethods
parent186c4d03ea8bf3aee4c535453409f1234442bff3 (diff)
downloadopie-f7b5905d990f374dd6cb177b7a03628cc593b7cf.zip
opie-f7b5905d990f374dd6cb177b7a03628cc593b7cf.tar.gz
opie-f7b5905d990f374dd6cb177b7a03628cc593b7cf.tar.bz2
gcc 3.4 fixes
Diffstat (limited to 'inputmethods') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/pickboard/pickboardcfg.cpp10
-rw-r--r--inputmethods/pickboard/pickboardcfg.h2
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)
155 int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2; 155 int x = spread ? (parent->width()-tw-xw*(i-1))/2 : 2;
156 156
157 i=0; 157 i=0;
158 for (; !(s=text(r,i)).isNull(); ++i) { 158 for (; !(s=text(r,i)).isNull(); ++i) {
159 int w = fm.width(s)+xw; 159 int w = fm.width(s)+xw;
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 }
166 p->drawText(x,-fm.descent()-1,s); 166 p->drawText(x,-fm.descent()-1,s);
167 x += w; 167 x += w;
168 } 168 }
169 } 169 }
170} 170}
@@ -428,16 +428,16 @@ void DictFilterConfig::pick(bool press, int row, int item)
428 lit0 = item; 428 lit0 = item;
429 if ( othermodes[item] == "Space" ) { 429 if ( othermodes[item] == "Space" ) {
430 updateItem(row,item); 430 updateItem(row,item);
431 generateText(" "); 431 generateText(" ");
432 } else if ( othermodes[item] == "Back" ) { 432 } else if ( othermodes[item] == "Back" ) {
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" ) {
439 updateItem(row,item); 439 updateItem(row,item);
440 shift = (shift+1)%3; 440 shift = (shift+1)%3;
441 } 441 }
442 } 442 }
443 } else { 443 } 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:
109 109
110 void draw(QPainter* p); 110 void draw(QPainter* p);
111 111
112protected: 112protected:
113 virtual QString text(int r, int i)=0; 113 virtual QString text(int r, int i)=0;
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);
117 virtual void updateItem(int r, int i); 117 virtual void updateItem(int r, int i);
118 virtual bool highlight(int,int) const; 118 virtual bool highlight(int,int) const;
119}; 119};
120 120
121class CharStringConfig : public StringConfig { 121class CharStringConfig : public StringConfig {