summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/handwriting/qimpeninput.cpp4
-rw-r--r--inputmethods/handwriting/qimpeninput.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/inputmethods/handwriting/qimpeninput.cpp b/inputmethods/handwriting/qimpeninput.cpp
index 3f7a347..db33c9b 100644
--- a/inputmethods/handwriting/qimpeninput.cpp
+++ b/inputmethods/handwriting/qimpeninput.cpp
@@ -113,50 +113,50 @@ static char * help_xpm[] = {
" 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 wf )
+ : QFrame( parent, name, wf ), 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 );
diff --git a/inputmethods/handwriting/qimpeninput.h b/inputmethods/handwriting/qimpeninput.h
index b4e4006..75cf260 100644
--- a/inputmethods/handwriting/qimpeninput.h
+++ b/inputmethods/handwriting/qimpeninput.h
@@ -20,49 +20,49 @@
#ifndef _QIMPENINPUT_H_
#define _QIMPENINPUT_H_
#include "qimpenprofile.h"
#include <qpe/qdawg.h>
#include <qframe.h>
#include <qlist.h>
#include <qguardedptr.h>
class QPushButton;
class QTimer;
class QIMPenWidget;
class QIMPenSetup;
class QIMPenWordPick;
class QIMPenMatch;
class HandwritingHelp;
class QIMPenInput : public QFrame
{
Q_OBJECT
public:
- QIMPenInput( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+ QIMPenInput( QWidget *parent = 0, const char *name = 0, WFlags wf = 0 );
virtual ~QIMPenInput();
void resetState();
QSize sizeHint() const;
signals:
void key( ushort, ushort, ushort, bool, bool );
private slots:
void wordPicked( const QString & );
void selectCharSet( int );
void beginStroke();
void strokeEntered( QIMPenStroke *st );
void matchedCharacters( const QIMPenCharMatchList &cl );
void keypress( uint scan_uni );
void erase();
void help();
void setup();
void backspace();
void enter();
private:
void loadProfiles();