1 files changed, 1 insertions, 1 deletions

diff --git a/inputmethods/handwriting/qimpenchar.cpp b/inputmethods/handwriting/qimpenchar.cpp
index 9c38ec9..152bfec 100644
--- a/inputmethods/handwriting/qimpenchar.cpp
+++ b/inputmethods/handwriting/qimpenchar.cpp
@@ -240,266 +240,266 @@ QDataStream &operator>> (QDataStream &s, QIMPenChar &ws)
         s >> *st;
         ws.strokes.append( st );
     }
 
     return s;
 }
 
 //===========================================================================
 
 bool QIMPenCharMatch::operator>( const QIMPenCharMatch &m )
 {
     return error > m.error;
 }
 
 bool QIMPenCharMatch::operator<( const QIMPenCharMatch &m )
 {
     return error < m.error;
 }
 
 bool QIMPenCharMatch::operator<=( const QIMPenCharMatch &m )
 {
     return error <= m.error;
 }
 
 //===========================================================================
 
 /*!
   \class QIMPenCharSet qimpenchar.h
 
   Maintains a set of related characters.
 */
 
 QIMPenCharSet::QIMPenCharSet()
 {
     chars.setAutoDelete( TRUE );
     desc = "Unnamed";
     csTitle = "abc";
     csType = Unknown;
     maxStrokes = 0;
 }
 
 /*!
   Construct and load a characters set from file \a fn.
 */
 QIMPenCharSet::QIMPenCharSet( const QString &fn )
 {
     chars.setAutoDelete( TRUE );
     desc = "Unnamed";
     csTitle = "abc";
     csType = Unknown;
     maxStrokes = 0;
     load( fn, System );
 }
 
 const QString &QIMPenCharSet::filename( Domain d ) const
 {
     if ( d == System )
         return sysFilename;
     else
         return userFilename;
 }
 
 void QIMPenCharSet::setFilename( const QString &fn, Domain d )
 {
     if ( d == System )
         sysFilename = fn;
     else if ( d == User )
         userFilename = fn;
 }
 
 /*!
   Load a character set from file \a fn.
 */
 bool QIMPenCharSet::load( const QString &fn, Domain d )
 {
     setFilename( fn, d );
 
     bool ok = FALSE;
     QFile file( fn );
     if ( file.open( IO_ReadOnly ) ) {
         QDataStream ds( &file );
         QString version;
         ds >> version;
         ds >> csTitle;
         ds >> desc;
         int major = version.mid( 4, 1 ).toInt();
         int minor = version.mid( 6 ).toInt();
         if ( major >= 1 && minor > 0 ) {
             ds >> (Q_INT8 &)csType;
         } else {
             if ( csTitle == "abc" )
                 csType = Lower;
             else if ( csTitle == "ABC" )
                 csType = Upper;
             else if ( csTitle == "123" )
                 csType = Numeric;
             else if ( fn == "Combining" )
                 csType = Combining;
         }
         while ( !ds.atEnd() ) {
             QIMPenChar *pc = new QIMPenChar;
             ds >> *pc;
             if ( d == User )
                 markDeleted( pc->character() ); // override system
             addChar( pc );
         }
         if ( file.status() == IO_Ok )
             ok = TRUE;
     }
 
     return ok;
 }
 
 /*!
   Save this character set.
 */
 bool QIMPenCharSet::save( Domain d )
 {
     if ( filename( d ).isEmpty() )
         return FALSE;
 
     bool ok = FALSE;
 
     QString fn = filename( d );
     QString tmpFn = fn + ".new";
     QFile file( tmpFn );
     if ( file.open( IO_WriteOnly|IO_Raw ) ) {
         QDataStream ds( &file );
         ds << QString( "QPT 1.1" );
         ds << csTitle;
         ds << desc;
         ds << (Q_INT8)csType;
         QIMPenCharIterator ci( chars );
         for ( ; ci.current(); ++ci ) {
             QIMPenChar *pc = ci.current();
             if ( ( (d == System) && pc->testFlag( QIMPenChar::System ) ) ||
                  ( (d == User) && !pc->testFlag( QIMPenChar::System ) ) ) {
                 ds << *pc;
             }
             if ( file.status() != IO_Ok )
                 break;
         }
         if ( file.status() == IO_Ok )
             ok = TRUE;
     }
 
     if ( ok ) {
         if ( ::rename( tmpFn.latin1(), fn.latin1() ) < 0 ) {
             qWarning( "problem renaming file %s to %s, errno: %d",
                     tmpFn.latin1(), fn.latin1(), errno );
             // remove the tmp file, otherwise, it will just lay around...
             QFile::remove( tmpFn.latin1() );
             ok = FALSE;
         }
     }
 
     return ok;
 }
 
 QIMPenChar *QIMPenCharSet::at( int i )
 {
     return chars.at(i);
 }
 
 void QIMPenCharSet::markDeleted( uint ch )
 {
     QIMPenCharIterator ci( chars );
     for ( ; ci.current(); ++ci ) {
         QIMPenChar *pc = ci.current();
         if ( pc->character() == ch && pc->testFlag( QIMPenChar::System ) )
             pc->setFlag( QIMPenChar::Deleted );
     }
 }
 
 /*!
   Find the best matches for \a ch in this character set.
 */
 QIMPenCharMatchList QIMPenCharSet::match( QIMPenChar *ch )
 {
     QIMPenCharMatchList matches;
 
     QIMPenCharIterator ci( chars );
     for ( ; ci.current(); ++ci ) {
         QIMPenChar *tmplChar = ci.current();
         if ( tmplChar->testFlag( QIMPenChar::Deleted ) ) {
             continue;
         }
         int err;
         if ( ch->penStrokes().count() <= tmplChar->penStrokes().count() ) {
             err = ch->match( tmplChar );
             if ( err <= QIMPEN_MATCH_THRESHOLD ) {
                 if (tmplChar->penStrokes().count() != ch->penStrokes().count())
-                    err = QIMPEN_MATCH_THRESHOLD;
+                    err = QMIN(err*3, QIMPEN_MATCH_THRESHOLD);
                 QIMPenCharMatchList::Iterator it;
                 for ( it = matches.begin(); it != matches.end(); ++it ) {
                     if ( (*it).penChar->character() == tmplChar->character() &&
                          (*it).penChar->penStrokes().count() == tmplChar->penStrokes().count() ) {
                         if ( (*it).error > err )
                             (*it).error = err;
                         break;
                     }
                 }
                 if ( it == matches.end() ) {
                     QIMPenCharMatch m;
                     m.error = err;
                     m.penChar = tmplChar;
                     matches.append( m );
                 }
             }
         }
     }
     qHeapSort( matches );
 /*
     QIMPenCharMatchList::Iterator it;
     for ( it = matches.begin(); it != matches.end(); ++it ) {
         qDebug( "Match: \'%c\', error %d, strokes %d", (*it).penChar->character(),
                                 (*it).error, (*it).penChar->penStrokes().count() );
     }
 */
     return matches;
 }
 
 /*!
   Add a character \a ch to this set.
   QIMPenCharSet will delete this character when it is no longer needed.
 */
 void QIMPenCharSet::addChar( QIMPenChar *ch )
 {
     if ( ch->penStrokes().count() > maxStrokes )
         maxStrokes = ch->penStrokes().count();
     chars.append( ch );
 }
 
 /*!
   Remove a character by reference \a ch from this set.
   QIMPenCharSet will delete this character.
 */
 void QIMPenCharSet::removeChar( QIMPenChar *ch )
 {
     chars.remove( ch );
 }
 
 /*!
   Move the character up the list of characters.
 */
 void QIMPenCharSet::up( QIMPenChar *ch )
 {
     int idx = chars.findRef( ch );
     if ( idx > 0 ) {
         chars.take();
         chars.insert( idx - 1, ch );
     }
 }
 
 /*!
   Move the character down the list of characters.
 */
 void QIMPenCharSet::down( QIMPenChar *ch )
 {
     int idx = chars.findRef( ch );
     if ( idx >= 0 && idx < (int)chars.count() - 1 ) {
         chars.take();
         chars.insert( idx + 1, ch );
     }
 }