gcc 3.4 fixes

1 files changed, 5 insertions, 5 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 4f4f25f..7ddfd3e 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -1,350 +1,350 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "keyboard.h"
 #include "configdlg.h"
 
 #include <qpe/global.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qwindowsystem_qws.h>
 #include <qpainter.h>
 #include <qfontmetrics.h>
 #include <qtimer.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <ctype.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 
 #include <sys/utsname.h>
 
 using namespace MultiKey;
 
 static const char * const kb_config_xpm[] = {
 "13 7 2 1",
 "   c None",
 ".  c #000000",
 "             ",
 "      .      ",
 "     ...     ",
 "    .....    ",
 "      .      ",
 "      .      ",
 "             "};
 
 /* Keyboard::Keyboard {{{1 */
 Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
     QFrame(parent, _name, f),  shift(0), lock(0), ctrl(0), alt(0), 
     meta(0), circumflex(0), diaeresis(0), baccent(0), accent(0),
     useLargeKeys(TRUE), usePicks(0), useRepeat(0), 
     pressedKeyRow(-1), pressedKeyCol(-1),
     unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
     configdlg(0)
 
 {
 
     // get the default font
     Config *config = new Config( "qpe" );
     config->setGroup( "Appearance" );
     QString familyStr = config->readEntry( "FontFamily", "smallsmooth" );
     delete config;
 
     config = new Config("multikey");
     config->setGroup ("general");
     usePicks = config->readBoolEntry ("usePickboard", 0); // default closed
     useRepeat = config->readBoolEntry ("useRepeat", 1);
     delete config;
 
 
     setFont( QFont( familyStr, 10 ) );
 
     picks = new KeyboardPicks( this );
     picks->setFont( QFont( familyStr, 10 ) );
     picks->initialise();
     if (usePicks) {
 
         QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
             this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
 
     } else picks->hide();
 
     loadKeyboardColors();
 
     keys = new Keys();
 
     repeatTimer = new QTimer( this );
     connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
 
     QCopChannel* kbdChannel = new QCopChannel("MultiKey/Keyboard", this);
     connect(kbdChannel, SIGNAL(received(const QCString&,const QByteArray&)),
             this, SLOT(receive(const QCString&,const QByteArray&)));
 }
 
 Keyboard::~Keyboard() {
 
     if ( configdlg ) { 
         delete configdlg;
         configdlg = 0;
     }
 
 }
 
 /* Keyboard::resizeEvent {{{1 */
 void Keyboard::resizeEvent(QResizeEvent*)
 {
     int ph = picks->sizeHint().height();
     picks->setGeometry( 0, 0, width(), ph );
     keyHeight = (height()-(usePicks ? ph : 0))/(keys->rows()?keys->rows():1);
 
     int nk; // number of keys?
     if ( useLargeKeys ) {
         nk = 15;
     } else {
         nk = 19;
     }
     defaultKeyWidth = (width()/nk)/2;
     xoffs = (width()-defaultKeyWidth*nk)/2; // empty key spaces?
 
 }
 
 /* KeyboardPicks::initialize {{{1 */
 void KeyboardPicks::initialise()
 {
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
     mode = 0;
     dc = new KeyboardConfig(this);
     configs.append(dc);
 }
 
 /* KeyboardPicks::sizeHint {{{1 */
 QSize KeyboardPicks::sizeHint() const
 {
     return QSize(240,fontMetrics().lineSpacing());
 }
 
 
 /* KeyboardConfig::generateText {{{1 */
-void  KeyboardConfig::generateText(const QString &s)
+void KeyboardConfig::generateText(const QString &s)
 {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     for (int i=0; i<(int)backspaces; i++) {
-        parent->emitKey( 0, Qt::Key_Backspace, 0, true, false );
-        parent->emitKey( 0, Qt::Key_Backspace, 0, false, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, true, false );
+        parent->emitKey( 0, ::Qt::Key_Backspace, 0, false, false );
     }
     for (int i=0; i<(int)s.length(); i++) {
         parent->emitKey( s[i].unicode(), 0, 0, true, false );
         parent->emitKey( s[i].unicode(), 0, 0, false, false );
     }
-    parent->emitKey( 0, Qt::Key_Space, 0, true, false );
-    parent->emitKey( 0, Qt::Key_Space, 0, false, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, true, false );
+    parent->emitKey( 0, ::Qt::Key_Space, 0, false, false );
     backspaces = 0;
 #endif
 }
 
 
 
 
 /* Keyboard::paintEvent {{{1 */
 void Keyboard::paintEvent(QPaintEvent* e)
 {
     QPainter painter(this);
     painter.setClipRect(e->rect());
     drawKeyboard( painter );
     picks->dc->draw( &painter );
 }
 
 
 /* Keyboard::drawKeyboard {{{1 */
 
 void Keyboard::drawKeyboard(QPainter &p, int row, int col)
 {
 
 
     if (row != -1 && col != -1) { //just redraw one key
 
         int x = 0;
         for (int i = 0; i < col; i++) {
 
             x += keys->width(row, i) * defaultKeyWidth;
         }
         int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0);
 
         int keyWidth = keys->width(row, col);
 
         p.fillRect(x + 1, y + 1, 
                    keyWidth * defaultKeyWidth - 1, keyHeight - 1, 
                    pressed || keys->pressed(row, col) ? keycolor_pressed : keycolor);
 
         QImage *pix = keys->pix(row,col);
 
         ushort c = keys->uni(row, col);
 
         p.setPen(textcolor);
         if (!pix) {
             if ((shift || lock) && keys->shift(c)) 
 
                 if (circumflex && keys->circumflex(keys->shift(c)))
                     c = keys->circumflex(keys->shift(c));
                 else if (diaeresis && keys->diaeresis(keys->shift(c)))
                     c = keys->diaeresis(keys->shift(c));
                          else if (baccent && keys->baccent(keys->shift(c)))
                     c = keys->baccent(keys->shift(c));
                 else if (accent && keys->accent(keys->shift(c)))
                     c = keys->accent(keys->shift(c));
                 else if (meta && keys->meta(keys->shift(c)))
                     c = keys->meta(keys->shift(c));
                 else 
                     c = keys->shift(c);
 
             else if (meta && keys->meta(c)) 
                 c = keys->meta(c);
             else if (circumflex && keys->circumflex(c)) 
                 c = keys->circumflex(c);
                   else if (baccent && keys->baccent(c))
                 c = keys->baccent(c);
                   else if (accent && keys->accent(c))
                 c = keys->accent(c);
             else if (diaeresis && (keys->diaeresis(c) || c == 0x2c6)) {
 
                 // the diaeresis key itself has to be in the diaeresisMap,
                 // or just do this to make it display the diaeresis char.
                 
                 if (c == 0x2c6)
                     c = 0xa8;
                 else 
                     c = keys->diaeresis(c);
             }
             
             p.drawText(x, y, 
                defaultKeyWidth * keyWidth + 3, keyHeight,
                AlignCenter, (QChar)c);
         }
         else
             // center the image in the middle of the key
             p.drawImage( x + (defaultKeyWidth * keyWidth - pix->width())/2 + 1, 
                           y + (keyHeight - pix->height())/2 + 1, 
                           *pix );
 
         // this fixes the problem that the very right end of the board's vertical line
         // gets painted over, because it's one pixel shorter than all other keys
         p.setPen(keycolor_lines);
         p.drawLine(width() - 1, 0, width() - 1, height());
 
     } else {
 
 
     p.fillRect(0, 0, width(), height(), keycolor);
 
     for (row = 1; row <= keys->rows(); row++) {
 
         int x = 0;
         int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0);
 
         p.setPen(keycolor_lines);
         p.drawLine(x, y, x + width(), y);
 
         for (int col = 0; col < keys->numKeys(row); col++) {
 
             QImage *pix = keys->pix(row, col);
             int keyWidth = keys->width(row, col);
 
 
             int keyWidthPix = defaultKeyWidth * keyWidth;
 
             if (keys->pressed(row, col)) 
                 p.fillRect(x+1, y+1, keyWidthPix - 1, 
                            keyHeight - 1, keycolor_pressed);
 
             ushort c = keys->uni(row, col);
 
             p.setPen(textcolor);
             if (!pix) {
                 if ((shift || lock) && keys->shift(c)) 
 
                     if (circumflex && keys->circumflex(keys->shift(c)))
                         c = keys->circumflex(keys->shift(c));
                     else if (diaeresis && keys->diaeresis(keys->shift(c)))
                         c = keys->diaeresis(keys->shift(c));
                     else if (baccent && keys->baccent(keys->shift(c)))
                         c = keys->baccent(keys->shift(c));
                     else if (accent && keys->accent(keys->shift(c)))
                         c = keys->accent(keys->shift(c));
                     else if (meta && keys->meta(keys->shift(c)))
                         c = keys->meta(keys->shift(c));
                     else 
                         c = keys->shift(c);
 
                 else if (meta && keys->meta(c)) 
                     c = keys->meta(c);
                 else if (circumflex && keys->circumflex(c))
                     c = keys->circumflex(c);
                 else if (baccent && keys->baccent(c))
                     c = keys->baccent(c);
                 else if (accent && keys->accent(c))
                     c = keys->accent(c);
                 else if (diaeresis && (keys->diaeresis(c) || c == 0x2c6)) {
 
                     if (c == 0x2c6)
                         c = 0xa8;
                     else 
                         c = keys->diaeresis(c);
                 }
 
                 p.drawText(x, y, 
                    keyWidthPix + 3, keyHeight,
                    AlignCenter, (QChar)c);
             }
             else {
                 // center the image in the middle of the key
                 pix->setColor(1, textcolor.rgb());
                 p.drawImage( x + (keyWidthPix - pix->width())/2 + 1, 
                               y + (keyHeight - pix->height())/2 + 1, 
                               QImage(*pix) );
             }
 
             p.setPen(keycolor_lines);
             p.drawLine(x, y, x, y + keyHeight);
 
             x += keyWidthPix;
         }
 
 
     }
     p.setPen(keycolor_lines);
     p.drawLine(0, height() - 1, width(), height() - 1);
     p.drawLine(width() - 1, 0, width() - 1, height());
     }
 
 }
 
 
 /* Keyboard::mousePressEvent {{{1 */
 void Keyboard::mousePressEvent(QMouseEvent *e)
 {
     int row = (e->y() - (usePicks ? picks->height() : 0)) / keyHeight + 1;
     if (row > 5) row = 5;
 
     // figure out the column
     int col = 0; 
     for (int w = 0; e->x() >= w; col++)
         if (col < keys->numKeys(row)) // it segfaults if it trys to read past numKeys
             w += keys->width(row,col) * defaultKeyWidth;