- fixed warning about shadowing

1 files changed, 2 insertions, 2 deletions

diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp
index 6718b26..9acab8b 100644
--- a/inputmethods/handwriting/qimpeninput.cpp
+++ b/inputmethods/handwriting/qimpeninput.cpp
@@ -41,194 +41,194 @@
 
 // We'll use little pixmaps for the buttons to save screen space.
 
 /* XPM */
 static const char * const pen_xpm[] = {
 "12 12 4 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF",
 "@	c #808080",
 "         .  ",
 "        .+. ",
 "       ..@@.",
 "      .+@.. ",
 "     .+@@.  ",
 "    .+@@.   ",
 "   .+@@.    ",
 "  .@.@.     ",
 "  .@@.      ",
 " ....       ",
 " ..         ",
 "            "};
 
 
 /* XPM */
 static char * bs_xpm[] = {
 "12 12 5 1",
 " 	c None",
 ".	c #333333",
 "+	c #000000",
 "@	c #FFFFFF",
 "#	c #666666",
 "            ",
 "            ",
 "            ",
 "    .       ",
 "   ++       ",
 "  +@#+++++. ",
 " +@@@@@@@@+ ",
 "  +@#+++++. ",
 "   ++       ",
 "    .       ",
 "            ",
 "            "};
 
 
 /* XPM */
 static char * enter_xpm[] = {
 "12 12 5 1",
 " 	c None",
 ".	c #333333",
 "+	c #000000",
 "@	c #FFFFFF",
 "#	c #666666",
 "            ",
 "        .+. ",
 "        +@+ ",
 "    .   +@+ ",
 "   ++   +@+ ",
 "  +@#++++@+ ",
 " +@@@@@@@@+ ",
 "  +@#+++++. ",
 "   ++       ",
 "    .       ",
 "            ",
 "            "};
 
 
 
 /* XPM */
 static char * help_xpm[] = {
 "12 12 5 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF",
 "@	c #666666",
 "#	c #333333",
 "            ",
 "    ...     ",
 "   .+++.    ",
 "  .+..@+.   ",
 "  #.# .+.   ",
 "      .+.   ",
 "     .+.    ",
 "    .+.     ",
 "    .+.     ",
 "    #.#     ",
 "    .+.     ",
 "    #.#     "};
 
 
 /*!
   \class QIMPenInput qimpeninput.h
 
   Pen input widget.
 */
-QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags f )
-    : QFrame( parent, name, f ), helpDlg(0), profile(0)
+QIMPenInput::QIMPenInput( QWidget *parent, const char *name, WFlags flags )
+    : QFrame( parent, name, flags ), helpDlg(0), profile(0)
 {
     setFrameStyle( Box | Plain );
 
     profileList.setAutoDelete( true );
 
     matcher = new QIMPenMatch( this );
     connect( matcher, SIGNAL(keypress(uint)), this, SLOT(keypress(uint)) );
     connect( matcher, SIGNAL(erase()), this, SLOT(erase()) );
 
     QGridLayout *gl = new QGridLayout( this, 5, 2, 1, 0 );
     gl->setColStretch( 0, 1 );
 
     wordPicker = new QIMPenWordPick( this );
     connect( wordPicker, SIGNAL(wordClicked(const QString &)),
 	     this, SLOT(wordPicked(const QString &)) );
     connect( matcher, SIGNAL(matchedCharacters(const QIMPenCharMatchList &)),
 	     this, SLOT(matchedCharacters(const QIMPenCharMatchList &)) );
     connect( matcher, SIGNAL(matchedWords(const QIMPenMatch::MatchWordList&)),
 	     wordPicker, SLOT(setWords(const QIMPenMatch::MatchWordList&)) );
     QFont f("smallsmooth",9);
     QFontInfo fi( f );
     wordPicker->setFont( f );
     wordPicker->setBackgroundColor( white );
     gl->addMultiCellWidget( wordPicker, 0, 0, 0, 1 );
     if ( !Global::fixedDawg().root() || !matcher->isWordMatchingEnabled() )
 	wordPicker->hide();
 
     pw = new QIMPenWidget( this );
     gl->addMultiCellWidget( pw, 1, 4, 0, 0 );
 
     int bh = pw->sizeHint().height()/4;
 
     QPushButton *b = new QPushButton( this );
     b->setFocusPolicy( NoFocus );
     b->setPixmap( QPixmap( (const char **)bs_xpm ) );
     b->setFixedHeight(pw->sizeHint().height()-3*bh); // left-over space goes here
     b->setAutoRepeat( TRUE );
     gl->addWidget( b, 1, 1 );
     connect( b, SIGNAL(clicked()), SLOT(backspace()));
 
     b = new QPushButton( this );
     b->setFocusPolicy( NoFocus );
     b->setPixmap( QPixmap( (const char **)enter_xpm ) );
     b->setFixedHeight(bh);
     b->setAutoRepeat( TRUE );
     gl->addWidget( b, 2, 1 );
     connect( b, SIGNAL(clicked()), SLOT(enter()));
 
     helpBtn = new QPushButton( this );
     helpBtn->setFocusPolicy( NoFocus );
     helpBtn->setPixmap( QPixmap( (const char **)help_xpm ) );
     helpBtn->setFixedHeight(bh);
     gl->addWidget( helpBtn, 3, 1 );
     connect( helpBtn, SIGNAL(clicked()), SLOT(help()));
 
     QPixmap pm( (const char **)pen_xpm );
     setupBtn = new QPushButton( this );
     setupBtn->setFocusPolicy( NoFocus );
     setupBtn->setPixmap( pm );
     setupBtn->setFixedHeight(bh);
     gl->addWidget( setupBtn, 4, 1 );
     connect( setupBtn, SIGNAL(clicked()), SLOT(setup()));
 
     connect( matcher, SIGNAL(removeStroke()), pw, SLOT(removeStroke()) );
     connect( pw, SIGNAL(changeCharSet( QIMPenCharSet * )),
              matcher, SLOT(setCharSet( QIMPenCharSet * )) );
     connect( pw, SIGNAL(changeCharSet( int )),
              this, SLOT(selectCharSet( int )) );
     connect( pw, SIGNAL(beginStroke()),
 	     matcher, SLOT(beginStroke()) );
     connect( pw, SIGNAL(stroke( QIMPenStroke * )),
              this, SLOT(strokeEntered( QIMPenStroke * )) );
     connect( pw, SIGNAL(stroke( QIMPenStroke * )),
              matcher, SLOT(strokeEntered( QIMPenStroke * )) );
 
     shortcutCharSet = 0;
     currCharSet = 0;
     setupDlg = 0;
     profile = 0;
     mode = Normal;
 
     loadProfiles();
 }
 
 QIMPenInput::~QIMPenInput()
 {
     delete (HandwritingHelp*) helpDlg;
 }
 
 QSize QIMPenInput::sizeHint() const
 {
     int fw = frameWidth();
     int ps = wordPicker->isHidden() ? 0 : wordPicker->sizeHint().height();
     return pw->sizeHint() + QSize( fw*2, fw*2+ps );
 }