You can subscribe to this list here.
2002 |
Jan
(108) |
Feb
(129) |
Mar
(48) |
Apr
(57) |
May
(51) |
Jun
(271) |
Jul
(147) |
Aug
(92) |
Sep
(198) |
Oct
(71) |
Nov
(19) |
Dec
(56) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(21) |
Feb
(28) |
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
(44) |
Aug
(3) |
Sep
(2) |
Oct
(62) |
Nov
(79) |
Dec
(379) |
2004 |
Jan
(25) |
Feb
(19) |
Mar
(269) |
Apr
(114) |
May
(58) |
Jun
(36) |
Jul
(65) |
Aug
(19) |
Sep
(292) |
Oct
(752) |
Nov
(8) |
Dec
(227) |
2005 |
Jan
(45) |
Feb
(259) |
Mar
(75) |
Apr
(8) |
May
(193) |
Jun
(11) |
Jul
|
Aug
(180) |
Sep
|
Oct
(5) |
Nov
(278) |
Dec
|
2006 |
Jan
|
Feb
(182) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(154) |
Sep
|
Oct
(3) |
Nov
(3) |
Dec
(3) |
2007 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2010 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:34
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/solaris-cc-64 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/solaris-cc-64 Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:34
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/tru64-g++ In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/tru64-g++ Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:33
|
Update of /cvsroot/facturalux/lite/src/qt/tools/linguist/lupdate In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/tools/linguist/lupdate Modified Files: numberh.cpp Log Message: Version 2.1 cerrada Index: numberh.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/linguist/lupdate/numberh.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** numberh.cpp 9 Nov 2005 08:59:01 -0000 1.4 --- numberh.cpp 21 Aug 2006 20:06:43 -0000 1.5 *************** *** 63,67 **** static QCString zeroKey( const char *key ) { ! QCString zeroed( strlen(key) + 1 ); char *z = zeroed.data(); int i = 0, j = 0; --- 63,67 ---- static QCString zeroKey( const char *key ) { ! QCString zeroed( (int)strlen(key) + 1 ); char *z = zeroed.data(); int i = 0, j = 0; |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:32
|
Update of /cvsroot/facturalux/lite/src/qt/src/sql In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/src/sql Modified Files: qsql.cpp qsqldriverinterface_p.h qsqldriverplugin.cpp qsqldriverplugin.h Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:31
|
Update of /cvsroot/facturalux/lite/src/qt/qmake/generators/unix In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/qmake/generators/unix Modified Files: unixmake.cpp unixmake.h unixmake2.cpp Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:31
|
Update of /cvsroot/facturalux/lite/src/qt/src/sql/drivers/mysql In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/src/sql/drivers/mysql Modified Files: qsql_mysql.cpp Log Message: Version 2.1 cerrada Index: qsql_mysql.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/sql/drivers/mysql/qsql_mysql.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** qsql_mysql.cpp 9 Nov 2005 08:58:56 -0000 1.4 --- qsql_mysql.cpp 21 Aug 2006 20:06:39 -0000 1.5 *************** *** 297,308 **** return FALSE; cleanup(); ! if ( mysql_real_query( d->mysql, query, query.length() ) ) { setLastError( qMakeError("Unable to execute query", QSqlError::Statement, d ) ); return FALSE; } if ( isForwardOnly() ) { ! if ( isActive() || isValid() ) // have to empty the results from previous query fetchLast(); ! d->result = mysql_use_result( d->mysql ); } else { d->result = mysql_store_result( d->mysql ); --- 297,310 ---- return FALSE; cleanup(); ! ! const char *encQuery = query.ascii(); ! if ( mysql_real_query( d->mysql, encQuery, qstrlen(encQuery) ) ) { setLastError( qMakeError("Unable to execute query", QSqlError::Statement, d ) ); return FALSE; } if ( isForwardOnly() ) { ! if ( isActive() || isValid() ) // have to empty the results from previous query fetchLast(); ! d->result = mysql_use_result( d->mysql ); } else { d->result = mysql_store_result( d->mysql ); |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:30
|
Update of /cvsroot/facturalux/lite/src/qt/src/workspace In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/src/workspace Modified Files: qworkspace.cpp qworkspace.h Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:29
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/linux-pgcc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/linux-pgcc Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:28
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/linux-cxx In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/linux-cxx Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:28
|
Update of /cvsroot/facturalux/lite/src/qt/tools/designer/designer In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/tools/designer/designer Modified Files: command.cpp designer.pro formfile.cpp formfile.h layout.cpp metadatabase.cpp propertyeditor.cpp Log Message: Version 2.1 cerrada Index: command.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/designer/command.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** command.cpp 9 Nov 2005 08:58:59 -0000 1.5 --- command.cpp 21 Aug 2006 20:06:43 -0000 1.6 *************** *** 1734,1738 **** #ifndef QT_NO_TABLE QMap<QString, QString> columnFields; ! table->setNumCols( newColumns.count() ); int i = 0; for ( QValueList<Column>::Iterator cit = newColumns.begin(); cit != newColumns.end(); ++cit, ++i ) { --- 1734,1738 ---- #ifndef QT_NO_TABLE QMap<QString, QString> columnFields; ! table->setNumCols( (int)newColumns.count() ); int i = 0; for ( QValueList<Column>::Iterator cit = newColumns.begin(); cit != newColumns.end(); ++cit, ++i ) { *************** *** 1742,1746 **** } MetaDataBase::setColumnFields( table, columnFields ); ! table->setNumRows( newRows.count() ); i = 0; for ( QValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) --- 1742,1746 ---- } MetaDataBase::setColumnFields( table, columnFields ); ! table->setNumRows( (int)newRows.count() ); i = 0; for ( QValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) *************** *** 1753,1757 **** #ifndef QT_NO_TABLE QMap<QString, QString> columnFields; ! table->setNumCols( oldColumns.count() ); int i = 0; for ( QValueList<Column>::Iterator cit = oldColumns.begin(); cit != oldColumns.end(); ++cit, ++i ) { --- 1753,1757 ---- #ifndef QT_NO_TABLE QMap<QString, QString> columnFields; ! table->setNumCols( (int)oldColumns.count() ); int i = 0; for ( QValueList<Column>::Iterator cit = oldColumns.begin(); cit != oldColumns.end(); ++cit, ++i ) { *************** *** 1761,1765 **** } MetaDataBase::setColumnFields( table, columnFields ); ! table->setNumRows( oldRows.count() ); i = 0; for ( QValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) --- 1761,1765 ---- } MetaDataBase::setColumnFields( table, columnFields ); ! table->setNumRows( (int)oldRows.count() ); i = 0; for ( QValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) Index: designer.pro =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/designer/designer.pro,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** designer.pro 23 Oct 2004 15:07:43 -0000 1.3 --- designer.pro 21 Aug 2006 20:06:43 -0000 1.4 *************** *** 65,69 **** paletteeditoradvancedimpl.cpp \ sourcefile.cpp \ - filechooser.cpp \ wizardeditorimpl.cpp \ qcompletionedit.cpp \ --- 65,68 ---- *************** *** 129,133 **** pixmapcollection.h \ sourcefile.h \ - filechooser.h \ wizardeditorimpl.h \ qcompletionedit.h \ --- 128,131 ---- Index: formfile.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/designer/formfile.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** formfile.cpp 9 Nov 2005 08:59:00 -0000 1.5 --- formfile.cpp 21 Aug 2006 20:06:43 -0000 1.6 *************** *** 64,68 **** : filename( fn ), fileNameTemp( temp ), pro( p ), fw( 0 ), ed( 0 ), timeStamp( 0, fn + codeExtension() ), codeEdited( FALSE ), pkg( FALSE ), ! cm( FALSE ), codeFileStat( None ) { MetaDataBase::addEntry( this ); --- 64,68 ---- : filename( fn ), fileNameTemp( temp ), pro( p ), fw( 0 ), ed( 0 ), timeStamp( 0, fn + codeExtension() ), codeEdited( FALSE ), pkg( FALSE ), ! cm( FALSE ), codeFileStat( None ), timeStampUi(0, fn) { MetaDataBase::addEntry( this ); *************** *** 73,76 **** --- 73,77 ---- if ( !temp ) checkFileName( FALSE ); + timeStampUi.update(); } *************** *** 114,117 **** --- 115,119 ---- filename = fn; timeStamp.setFileName( filename + codeExtension() ); + timeStampUi.setFileName( filename ); cod = ""; loadCode(); *************** *** 164,167 **** --- 166,171 ---- if ( ed ) ed->save(); + if (!shouldOverwriteUi()) + return TRUE; if ( formWindow() && isModified( WFormWindow ) ) { *************** *** 237,244 **** --- 241,259 ---- } timeStamp.update(); + timeStampUi.update(); setModified( FALSE ); return TRUE; } + bool FormFile::shouldOverwriteUi() const + { + if (timeStampUi.isUpToDate()) + return TRUE; + return (QMessageBox::information(MainWindow::self, tr( "Qt Designer" ), + tr("File '%1' has been changed outside Qt Designer.\n" + "Do you want to overwrite it?" ).arg(timeStampUi.fileName()), + tr("&Yes"), tr("&No")) == 0); + } + bool FormFile::saveAs( bool ignoreModified ) { Index: formfile.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/designer/formfile.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** formfile.h 9 Nov 2005 08:59:00 -0000 1.4 --- formfile.h 21 Aug 2006 20:06:43 -0000 1.5 *************** *** 124,127 **** --- 124,128 ---- QString codeExtension() const; bool checkFileName( bool allowBreak ); + bool shouldOverwriteUi() const; private: *************** *** 140,143 **** --- 141,145 ---- UihState codeFileStat; + TimeStamp timeStampUi; }; Index: layout.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/designer/layout.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** layout.cpp 9 Nov 2005 08:59:00 -0000 1.4 --- layout.cpp 21 Aug 2006 20:06:43 -0000 1.5 *************** *** 834,838 **** // skip them to increase speed even further delete grid; ! grid = new Grid( y.size()-1, x.size()-1 ); // Mark the cells in the grid that contains a widget --- 834,838 ---- // skip them to increase speed even further delete grid; ! grid = new Grid( (int)(y.size()-1), (int)(x.size()-1) ); // Mark the cells in the grid that contains a widget Index: metadatabase.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/designer/metadatabase.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** metadatabase.cpp 9 Nov 2005 08:59:00 -0000 1.4 --- metadatabase.cpp 21 Aug 2006 20:06:43 -0000 1.5 *************** *** 977,980 **** --- 977,981 ---- WidgetDatabaseRecord *r = new WidgetDatabaseRecord; r->name = wid->className; + r->includeFile = wid->includeFile; r->group = WidgetDatabase::widgetGroup( "Custom" ); r->toolTip = wid->className; Index: propertyeditor.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/designer/propertyeditor.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** propertyeditor.cpp 9 Nov 2005 08:59:00 -0000 1.4 --- propertyeditor.cpp 21 Aug 2006 20:06:43 -0000 1.5 *************** *** 2498,2508 **** if ( num > 3 || ! nextKey == QObject::Key_Control || ! nextKey == QObject::Key_Shift || ! nextKey == QObject::Key_Meta || ! nextKey == QObject::Key_Alt ) return; ! nextKey |= translateModifiers( e->state() ); switch( num ) { case 0: --- 2498,2512 ---- if ( num > 3 || ! nextKey == QObject::Key_Control || ! nextKey == QObject::Key_Shift || ! nextKey == QObject::Key_Meta || ! nextKey == QObject::Key_Alt) return; ! int modifier = translateModifiers( e->state() ); ! if (nextKey == QObject::Key_BackTab) ! modifier &= ~QObject::SHIFT; ! ! nextKey |= modifier; switch( num ) { case 0: *************** *** 2548,2553 **** setText( 1, sequence->text() ); PropertyItem::setValue( v ); ! if ( sequence->hasFocus() ) ! notifyValueChange(); setChanged( TRUE ); } --- 2552,2559 ---- setText( 1, sequence->text() ); PropertyItem::setValue( v ); ! if (sequence->hasFocus() ! // if the user wants to use F1 as accelerator, Designer will pop up a QWhatsThat widget ! || (qApp->focusWidget() && qApp->focusWidget()->inherits("QWhatsThat"))) ! notifyValueChange(); setChanged( TRUE ); } |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:27
|
Update of /cvsroot/facturalux/lite/src/libpq/include/server/parser In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/libpq/include/server/parser Modified Files: analyze.h gramparse.h keywords.h parse_agg.h parse_clause.h parse_coerce.h parse_expr.h parse_func.h parse_node.h parse_oper.h parse_relation.h parse_target.h parse_type.h parser.h parsetree.h scansup.h Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:23
|
Update of /cvsroot/facturalux/lite/src/sqlite In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/sqlite Modified Files: encode.c Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:22
|
Update of /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/src/3rdparty/opentype Modified Files: ftxgdef.c ftxgdef.h ftxgpos.c ftxgpos.h ftxgsub.c ftxgsub.h ftxopen.c ftxopen.h ftxopenf.h ftxopentype.c Log Message: Version 2.1 cerrada Index: ftxgdef.c =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxgdef.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxgdef.c 23 Oct 2004 15:06:45 -0000 1.3 --- ftxgdef.c 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 16,30 **** ******************************************************************/ - #include <freetype/tttags.h> - - #include <freetype/internal/ftstream.h> - #include <freetype/internal/ftmemory.h> - #include <freetype/internal/tttypes.h> - - #include "fterrcompat.h" - #include "ftxopen.h" #include "ftxopenf.h" #define TTAG_GDEF FT_MAKE_TAG( 'G', 'D', 'E', 'F' ) --- 16,26 ---- ******************************************************************/ #include "ftxopen.h" #include "ftxopenf.h" + #include "ftglue.h" + + #include FT_TRUETYPE_TAGS_H + #define TTAG_GDEF FT_MAKE_TAG( 'G', 'D', 'E', 'F' ) *************** *** 42,52 **** FT_Memory memory ); - /* GDEF glyph classes */ - - #define UNCLASSIFIED_GLYPH 0 - #define SIMPLE_GLYPH 1 - #define LIGATURE_GLYPH 2 - #define MARK_GLYPH 3 - #define COMPONENT_GLYPH 4 --- 38,41 ---- *************** *** 141,144 **** --- 130,164 ---- EXPORT_FUNC + FT_Error TT_New_GDEF_Table( FT_Face face, + TTO_GDEFHeader** retptr ) + { + FT_Error error; + FT_Memory memory = face->memory; + + TTO_GDEFHeader* gdef; + + if ( !retptr ) + return TT_Err_Invalid_Argument; + + if ( ALLOC( gdef, sizeof( *gdef ) ) ) + return error; + + gdef->memory = face->memory; + + gdef->GlyphClassDef.loaded = FALSE; + gdef->AttachList.loaded = FALSE; + gdef->LigCaretList.loaded = FALSE; + gdef->MarkAttachClassDef_offset = 0; + gdef->MarkAttachClassDef.loaded = FALSE; + + gdef->LastGlyph = 0; + gdef->NewGlyphClasses = NULL; + + *retptr = gdef; + + return TT_Err_Ok; + } + + EXPORT_FUNC FT_Error TT_Load_GDEF_Table( FT_Face face, TTO_GDEFHeader** retptr ) *************** *** 147,151 **** FT_Memory memory = face->memory; FT_Stream stream = face->stream; - TT_Face tt_face = (TT_Face)face; FT_ULong cur_offset, new_offset, base_offset; --- 167,170 ---- *************** *** 156,167 **** return TT_Err_Invalid_Argument; ! if (( error = tt_face->goto_table( tt_face, TTAG_GDEF, stream, 0 ) )) return error; ! if ( ALLOC( gdef, sizeof( *gdef ) ) ) return error; - gdef->memory = face->memory; - base_offset = FILE_Pos(); --- 175,184 ---- return TT_Err_Invalid_Argument; ! if (( error = ftglue_face_goto_table( face, TTAG_GDEF, stream ) )) return error; ! if (( error = TT_New_GDEF_Table ( face, &gdef ) )) return error; base_offset = FILE_Pos(); *************** *** 191,196 **** (void)FILE_Seek( cur_offset ); } - else - gdef->GlyphClassDef.loaded = FALSE; if ( ACCESS_Frame( 2L ) ) --- 208,211 ---- *************** *** 212,217 **** (void)FILE_Seek( cur_offset ); } - else - gdef->AttachList.loaded = FALSE; if ( ACCESS_Frame( 2L ) ) --- 227,230 ---- *************** *** 233,238 **** (void)FILE_Seek( cur_offset ); } - else - gdef->LigCaretList.loaded = FALSE; /* OpenType 1.2 has introduced the `MarkAttachClassDef' field. We --- 246,249 ---- *************** *** 252,260 **** gdef->MarkAttachClassDef_offset = 0; - gdef->MarkAttachClassDef.loaded = FALSE; - - gdef->LastGlyph = 0; - gdef->NewGlyphClasses = NULL; - *retptr = gdef; --- 263,266 ---- *************** *** 263,267 **** Fail3: Free_LigCaretList( &gdef->LigCaretList, memory ); ! Fail2: Free_AttachList( &gdef->AttachList, memory ); --- 269,273 ---- Fail3: Free_LigCaretList( &gdef->LigCaretList, memory ); ! Fail2: Free_AttachList( &gdef->AttachList, memory ); *************** *** 277,291 **** EXPORT_FUNC ! FT_Error TT_Done_GDEF_Table ( TTO_GDEFHeader* gdef ) { FT_Memory memory = gdef->memory; ! Free_LigCaretList( &gdef->LigCaretList, memory ); Free_AttachList( &gdef->AttachList, memory ); Free_ClassDefinition( &gdef->GlyphClassDef, memory ); Free_ClassDefinition( &gdef->MarkAttachClassDef, memory ); ! Free_NewGlyphClasses( gdef, memory ); return TT_Err_Ok; } --- 283,299 ---- EXPORT_FUNC ! FT_Error TT_Done_GDEF_Table ( TTO_GDEFHeader* gdef ) { FT_Memory memory = gdef->memory; ! Free_LigCaretList( &gdef->LigCaretList, memory ); Free_AttachList( &gdef->AttachList, memory ); Free_ClassDefinition( &gdef->GlyphClassDef, memory ); Free_ClassDefinition( &gdef->MarkAttachClassDef, memory ); ! Free_NewGlyphClasses( gdef, memory ); + FREE( gdef ); + return TT_Err_Ok; } *************** *** 734,740 **** FT_UShort index ) { ! FT_UShort glyph_index, array_index; FT_UShort byte, bits; ! TTO_ClassRangeRecord* gcrr; FT_UShort** ngc; --- 742,748 ---- FT_UShort index ) { ! FT_UShort glyph_index, array_index, count; FT_UShort byte, bits; ! TTO_ClassRangeRecord* gcrr; FT_UShort** ngc; *************** *** 744,753 **** return 0; gcrr = gdef->GlyphClassDef.cd.cd2.ClassRangeRecord; ngc = gdef->NewGlyphClasses; ! if ( glyphID < gcrr[index].Start ) { ! array_index = 0; if ( index == 0 ) glyph_index = glyphID; --- 752,762 ---- return 0; + count = gdef->GlyphClassDef.cd.cd2.ClassRangeCount; gcrr = gdef->GlyphClassDef.cd.cd2.ClassRangeRecord; ngc = gdef->NewGlyphClasses; ! if ( index < count && glyphID < gcrr[index].Start ) { ! array_index = index; if ( index == 0 ) glyph_index = glyphID; *************** *** 761,765 **** } ! byte = ngc[array_index][glyph_index / 4 + 1]; bits = byte >> ( 16 - ( glyph_index % 4 + 1 ) * 4 ); --- 770,774 ---- } ! byte = ngc[array_index][glyph_index / 4]; bits = byte >> ( 16 - ( glyph_index % 4 + 1 ) * 4 ); *************** *** 773,784 **** FT_UShort* property ) { ! const FT_UShort class2glyphProp[5] = { ! 0, /* UNCLASSIFIED_GLYPH */ ! TTO_BASE_GLYPH, /* SIMPLE_GLYPH 1 */ ! TTO_LIGATURE, /* LIGATURE_GLYPH 2 */ ! TTO_MARK, /* MARK_GLYPH 3 */ ! TTO_COMPONENT /* COMPONENT_GLYPH 4 */ ! }; ! FT_UShort klass, index; FT_Error error; --- 782,786 ---- FT_UShort* property ) { ! FT_UShort class, index; FT_Error error; *************** *** 792,816 **** if ( gdef->MarkAttachClassDef.loaded ) { ! error = Get_Class( &gdef->MarkAttachClassDef, glyphID, &klass, &index ); if ( error && error != TTO_Err_Not_Covered ) return error; if ( !error ) { ! *property = klass << 8; return TT_Err_Ok; } } ! if ( gdef->GlyphClassDef.loaded ) ! { ! error = Get_Class( &gdef->GlyphClassDef, glyphID, &klass, &index ); ! if ( error && error != TTO_Err_Not_Covered ) ! return error; ! } ! else ! { ! klass = 0; ! index = 0; ! } /* if we have a constructed class table, check whether additional --- 794,810 ---- if ( gdef->MarkAttachClassDef.loaded ) { ! error = Get_Class( &gdef->MarkAttachClassDef, glyphID, &class, &index ); if ( error && error != TTO_Err_Not_Covered ) return error; if ( !error ) { ! *property = class << 8; return TT_Err_Ok; } } ! error = Get_Class( &gdef->GlyphClassDef, glyphID, &class, &index ); ! if ( error && error != TTO_Err_Not_Covered ) ! return error; /* if we have a constructed class table, check whether additional *************** *** 818,824 **** if ( error == TTO_Err_Not_Covered && gdef->NewGlyphClasses ) ! klass = Get_New_Class( gdef, glyphID, index ); ! *property = class2glyphProp[klass]; return TT_Err_Ok; --- 812,839 ---- if ( error == TTO_Err_Not_Covered && gdef->NewGlyphClasses ) ! class = Get_New_Class( gdef, glyphID, index ); ! switch ( class ) ! { ! case UNCLASSIFIED_GLYPH: ! *property = 0; ! break; ! ! case SIMPLE_GLYPH: ! *property = TTO_BASE_GLYPH; ! break; ! ! case LIGATURE_GLYPH: ! *property = TTO_LIGATURE; ! break; ! ! case MARK_GLYPH: ! *property = TTO_MARK; ! break; ! ! case COMPONENT_GLYPH: ! *property = TTO_COMPONENT; ! break; ! } return TT_Err_Ok; *************** *** 829,833 **** FT_UShort start, FT_UShort end, ! FT_UShort klass, FT_Memory memory ) { --- 844,848 ---- FT_UShort start, FT_UShort end, ! FT_UShort class, FT_Memory memory ) { *************** *** 854,860 **** crr[index].Start = start; crr[index].End = end; ! crr[index].Class = klass; ! cd->Defined[klass] = TRUE; return TT_Err_Ok; --- 869,875 ---- crr[index].Start = start; crr[index].End = end; ! crr[index].Class = class; ! cd->Defined[class] = TRUE; return TT_Err_Ok; *************** *** 981,985 **** if ( ALLOC_ARRAY( gdef->NewGlyphClasses, gcd->cd.cd2.ClassRangeCount + 1, FT_UShort* ) ) ! goto Fail2; count = gcd->cd.cd2.ClassRangeCount; --- 996,1000 ---- if ( ALLOC_ARRAY( gdef->NewGlyphClasses, gcd->cd.cd2.ClassRangeCount + 1, FT_UShort* ) ) ! goto Fail3; count = gcd->cd.cd2.ClassRangeCount; *************** *** 990,1016 **** records. Each element holds four class values. */ ! if ( gcrr[0].Start ) { ! if ( ALLOC_ARRAY( ngc[0], gcrr[0].Start / 4 + 1, FT_UShort ) ) ! goto Fail1; ! } ! for ( n = 1; n < count; n++ ) ! { ! if ( gcrr[n].Start - gcrr[n - 1].End > 1 ) ! if ( ALLOC_ARRAY( ngc[n], ! ( gcrr[n].Start - gcrr[n - 1].End - 1 ) / 4 + 1, ! FT_UShort ) ) ! goto Fail1; ! } ! if ( gcrr[count - 1].End != num_glyphs - 1 ) { ! if ( ALLOC_ARRAY( ngc[count], ! ( num_glyphs - gcrr[count - 1].End - 1 ) / 4 + 1, ! FT_UShort ) ) ! goto Fail1; } ! gdef->LastGlyph = num_glyphs - 1; --- 1005,1041 ---- records. Each element holds four class values. */ ! if ( count > 0 ) { ! if ( gcrr[0].Start ) ! { ! if ( ALLOC_ARRAY( ngc[0], ( gcrr[0].Start + 3 ) / 4, FT_UShort ) ) ! goto Fail2; ! } ! for ( n = 1; n < count; n++ ) ! { ! if ( gcrr[n].Start - gcrr[n - 1].End > 1 ) ! if ( ALLOC_ARRAY( ngc[n], ! ( gcrr[n].Start - gcrr[n - 1].End + 2 ) / 4, ! FT_UShort ) ) ! goto Fail1; ! } ! if ( gcrr[count - 1].End != num_glyphs - 1 ) ! { ! if ( ALLOC_ARRAY( ngc[count], ! ( num_glyphs - gcrr[count - 1].End + 2 ) / 4, ! FT_UShort ) ) ! goto Fail1; ! } ! } ! else if ( num_glyphs > 0 ) { ! if ( ALLOC_ARRAY( ngc[count], ! ( num_glyphs + 3 ) / 4, ! FT_UShort ) ) ! goto Fail2; } ! gdef->LastGlyph = num_glyphs - 1; *************** *** 1018,1021 **** --- 1043,1048 ---- gdef->MarkAttachClassDef.loaded = FALSE; + gcd->loaded = TRUE; + return TT_Err_Ok; *************** *** 1061,1067 **** { FT_Error error; ! FT_UShort klass, new_class, index; FT_UShort byte, bits, mask; ! FT_UShort array_index, glyph_index; TTO_ClassRangeRecord* gcrr; --- 1088,1094 ---- { FT_Error error; ! FT_UShort class, new_class, index; FT_UShort byte, bits, mask; ! FT_UShort array_index, glyph_index, count; TTO_ClassRangeRecord* gcrr; *************** *** 1069,1083 **** ! if ( gdef->GlyphClassDef.loaded ) ! { ! error = Get_Class( &gdef->GlyphClassDef, glyphID, &klass, &index ); ! if ( error && error != TTO_Err_Not_Covered ) ! return error; ! } ! else ! { ! klass = 0; ! index = 0; ! } /* we don't accept glyphs covered in `GlyphClassDef' */ --- 1096,1103 ---- ! error = Get_Class( &gdef->GlyphClassDef, glyphID, &class, &index ); ! if ( error && error != TTO_Err_Not_Covered ) ! return error; ! /* we don't accept glyphs covered in `GlyphClassDef' */ *************** *** 1111,1120 **** } gcrr = gdef->GlyphClassDef.cd.cd2.ClassRangeRecord; ngc = gdef->NewGlyphClasses; ! if ( glyphID < gcrr[index].Start ) { ! array_index = 0; if ( index == 0 ) glyph_index = glyphID; --- 1131,1141 ---- } + count = gdef->GlyphClassDef.cd.cd2.ClassRangeCount; gcrr = gdef->GlyphClassDef.cd.cd2.ClassRangeRecord; ngc = gdef->NewGlyphClasses; ! if ( index < count && glyphID < gcrr[index].Start ) { ! array_index = index; if ( index == 0 ) glyph_index = glyphID; *************** *** 1128,1144 **** } ! byte = ngc[array_index][glyph_index / 4 + 1]; bits = byte >> ( 16 - ( glyph_index % 4 + 1 ) * 4 ); ! klass = bits & 0x000F; /* we don't overwrite existing entries */ ! if ( !klass ) { bits = new_class << ( 16 - ( glyph_index % 4 + 1 ) * 4 ); mask = ~( 0x000F << ( 16 - ( glyph_index % 4 + 1 ) * 4 ) ); ! ngc[array_index][glyph_index / 4 + 1] &= mask; ! ngc[array_index][glyph_index / 4 + 1] |= bits; } --- 1149,1165 ---- } ! byte = ngc[array_index][glyph_index / 4]; bits = byte >> ( 16 - ( glyph_index % 4 + 1 ) * 4 ); ! class = bits & 0x000F; /* we don't overwrite existing entries */ ! if ( !class ) { bits = new_class << ( 16 - ( glyph_index % 4 + 1 ) * 4 ); mask = ~( 0x000F << ( 16 - ( glyph_index % 4 + 1 ) * 4 ) ); ! ngc[array_index][glyph_index / 4] &= mask; ! ngc[array_index][glyph_index / 4] |= bits; } *************** *** 1147,1152 **** ! inline FT_Error Check_Property( TTO_GDEFHeader* gdef, ! FT_UShort index, FT_UShort flags, FT_UShort* property ) --- 1168,1173 ---- ! FT_Error Check_Property( TTO_GDEFHeader* gdef, ! OTL_GlyphItem gitem, FT_UShort flags, FT_UShort* property ) *************** *** 1154,1158 **** FT_Error error; - if ( gdef ) { --- 1175,1178 ---- *************** *** 1160,1166 **** FT_UShort desired_attachment_class; ! error = TT_GDEF_Get_Glyph_Property( gdef, index, property ); ! if ( error ) ! return error; /* If the glyph was found in the MarkAttachmentClass table, --- 1180,1191 ---- FT_UShort desired_attachment_class; ! if ( gitem->gproperties == OTL_GLYPH_PROPERTIES_UNKNOWN ) ! { ! error = TT_GDEF_Get_Glyph_Property( gdef, gitem->gindex, &gitem->gproperties ); ! if ( error ) ! return error; ! } ! ! *property = gitem->gproperties; /* If the glyph was found in the MarkAttachmentClass table, *************** *** 1179,1183 **** if ( flags & basic_glyph_class ) return TTO_Err_Not_Covered; ! /* The high byte of LookupFlags has the meaning * "ignore marks of attachment type different than --- 1204,1208 ---- if ( flags & basic_glyph_class ) return TTO_Err_Not_Covered; ! /* The high byte of LookupFlags has the meaning * "ignore marks of attachment type different than *************** *** 1185,1195 **** */ desired_attachment_class = flags & IGNORE_SPECIAL_MARKS; ! if ( desired_attachment_class && (*property & IGNORE_SPECIAL_MARKS) ) { ! if ( *property != desired_attachment_class ) return TTO_Err_Not_Covered; } - } else { - *property = 0; } --- 1210,1219 ---- */ desired_attachment_class = flags & IGNORE_SPECIAL_MARKS; ! if ( desired_attachment_class ) { ! if ( basic_glyph_class == TTO_MARK && ! *property != desired_attachment_class ) return TTO_Err_Not_Covered; } } Index: ftxgdef.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxgdef.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxgdef.h 23 Oct 2004 15:06:45 -0000 1.3 --- ftxgdef.h 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 31,34 **** --- 31,42 ---- + /* GDEF glyph classes */ + + #define UNCLASSIFIED_GLYPH 0 + #define SIMPLE_GLYPH 1 + #define LIGATURE_GLYPH 2 + #define MARK_GLYPH 3 + #define COMPONENT_GLYPH 4 + /* GDEF glyph properties, corresponding to class values 1-4. Note that TTO_COMPONENT has no corresponding flag in the LookupFlag field. */ *************** *** 184,187 **** --- 192,199 ---- FT_Error TT_Init_GDEF_Extension( TT_Engine engine ); */ + EXPORT_FUNC + FT_Error TT_New_GDEF_Table( FT_Face face, + TTO_GDEFHeader** retptr ); + EXPORT_DEF FT_Error TT_Load_GDEF_Table( FT_Face face, Index: ftxgpos.c =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxgpos.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxgpos.c 23 Oct 2004 15:06:45 -0000 1.3 --- ftxgpos.c 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 22,39 **** is something for a volunteer :-) */ - #define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' ) - - #include <freetype/tttags.h> - - #include <freetype/internal/ftstream.h> - #include <freetype/internal/ftmemory.h> - #include <freetype/internal/tttypes.h> - [...3600 lines suppressed...] ! continue; ! ! error = GPos_Do_String_Lookup( &gpi, lookup_index, buffer ); ! if ( error ) ! { ! if ( error != TTO_Err_Not_Covered ) ! return error; ! } ! else ! retError = error; ! } } + + error = Position_CursiveChain ( buffer ); + if ( error ) + return error; ! return retError; } Index: ftxgpos.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxgpos.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxgpos.h 23 Oct 2004 15:06:45 -0000 1.3 --- ftxgpos.h 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 33,44 **** /* Lookup types for glyph positioning */ ! #define GPOS_LOOKUP_SINGLE 1 ! #define GPOS_LOOKUP_PAIR 2 ! #define GPOS_LOOKUP_CURSIVE 3 ! #define GPOS_LOOKUP_MARKBASE 4 ! #define GPOS_LOOKUP_MARKLIG 5 ! #define GPOS_LOOKUP_MARKMARK 6 ! #define GPOS_LOOKUP_CONTEXT 7 ! #define GPOS_LOOKUP_CHAIN 8 #define GPOS_LOOKUP_EXTENSION 9 --- 33,44 ---- /* Lookup types for glyph positioning */ ! #define GPOS_LOOKUP_SINGLE 1 ! #define GPOS_LOOKUP_PAIR 2 ! #define GPOS_LOOKUP_CURSIVE 3 ! #define GPOS_LOOKUP_MARKBASE 4 ! #define GPOS_LOOKUP_MARKLIG 5 ! #define GPOS_LOOKUP_MARKMARK 6 ! #define GPOS_LOOKUP_CONTEXT 7 ! #define GPOS_LOOKUP_CHAIN 8 #define GPOS_LOOKUP_EXTENSION 9 *************** *** 77,86 **** FT_Pos* metric_value, void* data ); ! struct TTO_GPOSHeader_ { FT_Memory memory; ! FT_Fixed Version; --- 77,86 ---- FT_Pos* metric_value, void* data ); ! struct TTO_GPOSHeader_ { FT_Memory memory; ! FT_Fixed Version; *************** *** 759,782 **** - /* This `string object' is much simpler compared to TTO_GSUB_String. - A call to TTO_GPOS_Apply_String() will allocate it. */ - - struct TTO_GPOS_Data_ - { - FT_Pos x_pos; - FT_Pos y_pos; - FT_Pos x_advance; - FT_Pos y_advance; - FT_UShort back; /* number of glyphs to go back - for drawing current glyph */ - FT_Bool new_advance; /* if set, the advance width values are - absolute, i.e., they won't be - added to the original glyph's value - but rather replace them. */ - }; - - typedef struct TTO_GPOS_Data_ TTO_GPOS_Data; - - /* finally, the GPOS API */ --- 759,762 ---- *************** *** 823,826 **** --- 803,813 ---- EXPORT_DEF + FT_Error TT_GPOS_Add_Feature( TTO_GPOSHeader* gpos, + FT_UShort feature_index, + FT_UInt property ); + EXPORT_DEF + FT_Error TT_GPOS_Clear_Features( TTO_GPOSHeader* gpos ); + + EXPORT_DEF FT_Error TT_GPOS_Register_Glyph_Function( TTO_GPOSHeader* gpos, TTO_GlyphFunction gfunc ); *************** *** 835,846 **** EXPORT_DEF ! FT_Error TT_GPOS_Apply_Feature( FT_Face face, ! TTO_GPOSHeader* gpos, ! FT_UShort feature_index, ! FT_UShort load_flags, ! TTO_GSUB_String* in, ! TTO_GPOS_Data** out, ! FT_Bool dvi, ! FT_Bool r2l ); #ifdef __cplusplus --- 822,831 ---- EXPORT_DEF ! FT_Error TT_GPOS_Apply_String( FT_Face face, ! TTO_GPOSHeader* gpos, ! FT_UShort load_flags, ! OTL_Buffer buffer, ! FT_Bool dvi, ! FT_Bool r2l ); #ifdef __cplusplus Index: ftxgsub.c =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxgsub.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxgsub.c 23 Oct 2004 15:06:45 -0000 1.3 --- ftxgsub.c 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 22,58 **** is something for a volunteer :-) */ - #ifndef EXPORT_FUNC #define EXPORT_FUNC - #endif - - #include <freetype/tttags.h> - - #include <freetype/internal/ftstream.h> - #include <freetype/internal/ftmemory.h> [...2900 lines suppressed...] ! if ( error != TTO_Err_Not_Covered ) ! goto End; ! } ! else ! retError = error; ! ! error = otl_buffer_swap( buffer ); ! if ( error ) ! goto End; ! } } + + error = retError; ! End: return error; } + /* END */ Index: ftxgsub.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxgsub.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxgsub.h 23 Oct 2004 15:06:46 -0000 1.3 --- ftxgsub.h 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 64,68 **** { FT_Memory memory; ! FT_ULong offset; --- 64,68 ---- { FT_Memory memory; ! FT_ULong offset; *************** *** 480,488 **** typedef union TTO_GSUB_SubTable_ TTO_GSUB_SubTable; - struct TTO_Glyph_property_ { - unsigned char component; - }; - typedef struct TTO_Glyph_property_ TTO_Glyph_property; - #define MAX_COMPONENT_INDEX = 0x1f; /* A simple string object. It can both `send' and `receive' data. --- 480,483 ---- *************** *** 511,527 **** - struct TTO_GSUB_String_ - { - FT_ULong length; - FT_ULong pos; - FT_ULong allocated; - FT_UShort* string; - TTO_Glyph_property* glyph_properties; - FT_Int* character_index; - }; - - typedef struct TTO_GSUB_String_ TTO_GSUB_String; - - /* finally, the GSUB API */ --- 506,509 ---- *************** *** 568,605 **** EXPORT_DEF ! FT_Error TT_GSUB_Register_Alternate_Function( TTO_GSUBHeader* gsub, ! TTO_AltFunction altfunc, ! void* data ); ! ! EXPORT_DEF ! FT_Error TT_GSUB_String_New( TTO_GSUB_String **result ); ! ! EXPORT_DEF ! FT_Error TT_GSUB_String_Set_Length( TTO_GSUB_String *str, ! FT_ULong new_length); ! EXPORT_DEF ! FT_Error TT_GSUB_String_Allocate( TTO_GSUB_String *str, ! FT_ULong alloc); EXPORT_DEF ! FT_Error TT_GSUB_String_Done( TTO_GSUB_String *str ); ! ! EXPORT_DEF ! FT_Error TT_GSUB_Apply_Feature( TTO_GSUBHeader* gsub, ! FT_UShort feature_index, ! unsigned char *where_to_apply, ! TTO_GSUB_String** str, ! TTO_GSUB_String** tmp); ! - EXPORT_DEF - FT_Error TT_GSUB_Add_String( TTO_GSUB_String* in, - FT_UShort num_in, - TTO_GSUB_String* out, - FT_UShort num_out, - FT_UShort* glyph_data, - FT_UShort component); #ifdef __cplusplus --- 550,568 ---- EXPORT_DEF ! FT_Error TT_GSUB_Add_Feature( TTO_GSUBHeader* gsub, ! FT_UShort feature_index, ! FT_UInt property ); EXPORT_DEF ! FT_Error TT_GSUB_Clear_Features( TTO_GSUBHeader* gsub ); EXPORT_DEF ! FT_Error TT_GSUB_Register_Alternate_Function( TTO_GSUBHeader* gsub, ! TTO_AltFunction altfunc, ! void* data ); ! EXPORT_DEF ! FT_Error TT_GSUB_Apply_String( TTO_GSUBHeader* gsub, ! OTL_Buffer buffer ); #ifdef __cplusplus Index: ftxopen.c =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxopen.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxopen.c 23 Oct 2004 15:06:46 -0000 1.3 --- ftxopen.c 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 16,28 **** ******************************************************************/ - #include <freetype/internal/ftstream.h> - #include <freetype/internal/ftmemory.h> - #include <freetype/internal/tttypes.h> - - #include "fterrcompat.h" - #include "ftxopen.h" #include "ftxopenf.h" /*************************** --- 16,24 ---- ******************************************************************/ #include "ftxopen.h" #include "ftxopenf.h" + #include "ftglue.h" + /*************************** *************** *** 131,135 **** if ( s->LangSysCount == 0 && s->DefaultLangSys.FeatureCount == 0 ) { ! error = TTO_Err_Invalid_SubTable; goto Fail2; } --- 127,131 ---- if ( s->LangSysCount == 0 && s->DefaultLangSys.FeatureCount == 0 ) { ! error = TTO_Err_Empty_Script; goto Fail2; } *************** *** 206,210 **** FT_Memory memory = stream->memory; ! FT_UShort n, m, count; FT_ULong cur_offset, new_offset, base_offset; --- 202,206 ---- FT_Memory memory = stream->memory; ! FT_UShort n, script_count; FT_ULong cur_offset, new_offset, base_offset; *************** *** 217,221 **** return error; ! count = sl->ScriptCount = GET_UShort(); FORGET_Frame(); --- 213,217 ---- return error; ! script_count = GET_UShort(); FORGET_Frame(); *************** *** 223,238 **** sl->ScriptRecord = NULL; ! if ( ALLOC_ARRAY( sl->ScriptRecord, count, TTO_ScriptRecord ) ) return error; sr = sl->ScriptRecord; ! n = 0; ! for ( m = 0; m < count; m++ ) { if ( ACCESS_Frame( 6L ) ) goto Fail; ! sr[n].ScriptTag = GET_ULong(); new_offset = GET_UShort() + base_offset; --- 219,234 ---- sl->ScriptRecord = NULL; ! if ( ALLOC_ARRAY( sl->ScriptRecord, script_count, TTO_ScriptRecord ) ) return error; sr = sl->ScriptRecord; ! sl->ScriptCount= 0; ! for ( n = 0; n < script_count; n++ ) { if ( ACCESS_Frame( 6L ) ) goto Fail; ! sr[sl->ScriptCount].ScriptTag = GET_ULong(); new_offset = GET_UShort() + base_offset; *************** *** 240,256 **** cur_offset = FILE_Pos(); ! if ( (FILE_Seek( new_offset )) || ! ( error = Load_Script( &sr[n].Script, stream ) ) != TT_Err_Ok ) ! --sl->ScriptCount; ! else ! n++; (void)FILE_Seek( cur_offset ); } return TT_Err_Ok; Fail: ! for ( m = 0; m < n; m++ ) ! Free_Script( &sr[m].Script, memory ); FREE( sl->ScriptRecord ); --- 236,263 ---- cur_offset = FILE_Pos(); ! ! if ( FILE_Seek( new_offset ) ) ! goto Fail; ! ! error = Load_Script( &sr[sl->ScriptCount].Script, stream ); ! if ( error == TT_Err_Ok ) ! sl->ScriptCount += 1; ! else if ( error != TTO_Err_Empty_Script ) ! goto Fail; ! (void)FILE_Seek( cur_offset ); } + if ( sl->ScriptCount == 0 ) + { + error = TTO_Err_Invalid_SubTable; + goto Fail; + } + return TT_Err_Ok; Fail: ! for ( n = 0; n < sl->ScriptCount; n++ ) ! Free_Script( &sr[n].Script, memory ); FREE( sl->ScriptRecord ); *************** *** 363,366 **** --- 370,377 ---- if ( ALLOC_ARRAY( fl->FeatureRecord, count, TTO_FeatureRecord ) ) return error; + if ( ALLOC_ARRAY( fl->ApplyOrder, count, FT_UShort ) ) + goto Fail2; + + fl->ApplyCount = 0; fr = fl->FeatureRecord; *************** *** 369,373 **** { if ( ACCESS_Frame( 6L ) ) ! goto Fail; fr[n].FeatureTag = GET_ULong(); --- 380,384 ---- { if ( ACCESS_Frame( 6L ) ) ! goto Fail1; fr[n].FeatureTag = GET_ULong(); *************** *** 379,383 **** if ( FILE_Seek( new_offset ) || ( error = Load_Feature( &fr[n].Feature, stream ) ) != TT_Err_Ok ) ! goto Fail; (void)FILE_Seek( cur_offset ); } --- 390,394 ---- if ( FILE_Seek( new_offset ) || ( error = Load_Feature( &fr[n].Feature, stream ) ) != TT_Err_Ok ) ! goto Fail1; (void)FILE_Seek( cur_offset ); } *************** *** 385,393 **** return TT_Err_Ok; ! Fail: for ( m = 0; m < n; m++ ) Free_Feature( &fr[m].Feature, memory ); FREE( fl->FeatureRecord ); return error; } --- 396,408 ---- return TT_Err_Ok; ! Fail1: for ( m = 0; m < n; m++ ) Free_Feature( &fr[m].Feature, memory ); + FREE( fl->ApplyOrder ); + + Fail2: FREE( fl->FeatureRecord ); + return error; } *************** *** 412,415 **** --- 427,432 ---- FREE( fr ); } + + FREE( fl->ApplyOrder ); } *************** *** 690,693 **** --- 707,712 ---- if ( ALLOC_ARRAY( ll->Lookup, count, TTO_Lookup ) ) return error; + if ( ALLOC_ARRAY( ll->Properties, count, FT_UInt ) ) + goto Fail2; l = ll->Lookup; *************** *** 696,700 **** { if ( ACCESS_Frame( 2L ) ) ! goto Fail; new_offset = GET_UShort() + base_offset; --- 715,719 ---- { if ( ACCESS_Frame( 2L ) ) ! goto Fail1; new_offset = GET_UShort() + base_offset; *************** *** 705,709 **** if ( FILE_Seek( new_offset ) || ( error = Load_Lookup( &l[n], stream, type ) ) != TT_Err_Ok ) ! goto Fail; (void)FILE_Seek( cur_offset ); } --- 724,728 ---- if ( FILE_Seek( new_offset ) || ( error = Load_Lookup( &l[n], stream, type ) ) != TT_Err_Ok ) ! goto Fail1; (void)FILE_Seek( cur_offset ); } *************** *** 711,719 **** return TT_Err_Ok; ! Fail: for ( m = 0; m < n; m++ ) Free_Lookup( &l[m], type, memory ); FREE( ll->Lookup ); return error; --- 730,740 ---- return TT_Err_Ok; ! Fail1: ! FREE( ll->Properties ); for ( m = 0; m < n; m++ ) Free_Lookup( &l[m], type, memory ); + Fail2: FREE( ll->Lookup ); return error; *************** *** 730,733 **** --- 751,756 ---- + FREE( ll->Properties ); + if ( ll->Lookup ) { *************** *** 905,921 **** ! static inline FT_Error Coverage_Index1( TTO_CoverageFormat1* cf1, FT_UShort glyphID, FT_UShort* index ) { ! FT_UShort *min, *max, *middle; /* binary search */ ! min = cf1->GlyphArray; ! max = min + cf1->GlyphCount - 1; do { /* we use (min + max) / 2 = max - (max - min) / 2 to avoid overflow and rounding errors */ --- 928,953 ---- ! static FT_Error Coverage_Index1( TTO_CoverageFormat1* cf1, FT_UShort glyphID, FT_UShort* index ) { ! FT_UShort min, max, new_min, new_max, middle; ! ! FT_UShort* array = cf1->GlyphArray; ! /* binary search */ ! if ( cf1->GlyphCount == 0 ) ! return TTO_Err_Not_Covered; ! ! new_min = 0; ! new_max = cf1->GlyphCount - 1; do { + min = new_min; + max = new_max; + /* we use (min + max) / 2 = max - (max - min) / 2 to avoid overflow and rounding errors */ *************** *** 923,940 **** middle = max - ( ( max - min ) >> 1 ); ! if ( glyphID == *middle ) { ! *index = middle - cf1->GlyphArray; return TT_Err_Ok; } ! else if ( glyphID < *middle ) { ! max = middle - 1; } else { ! min = middle + 1; } ! } while ( min <= max ); return TTO_Err_Not_Covered; --- 955,976 ---- middle = max - ( ( max - min ) >> 1 ); ! if ( glyphID == array[middle] ) { ! *index = middle; return TT_Err_Ok; } ! else if ( glyphID < array[middle] ) { ! if ( middle == min ) ! break; ! new_max = middle - 1; } else { ! if ( middle == max ) ! break; ! new_min = middle + 1; } ! } while ( min < max ); return TTO_Err_Not_Covered; *************** *** 942,958 **** ! static inline FT_Error Coverage_Index2( TTO_CoverageFormat2* cf2, FT_UShort glyphID, FT_UShort* index ) { ! TTO_RangeRecord* min, *max, *middle; /* binary search */ ! min = cf2->RangeRecord; ! max = min + cf2->RangeCount - 1; do { /* we use (min + max) / 2 = max - (max - min) / 2 to avoid --- 978,1002 ---- ! static FT_Error Coverage_Index2( TTO_CoverageFormat2* cf2, FT_UShort glyphID, FT_UShort* index ) { ! FT_UShort min, max, new_min, new_max, middle; ! ! TTO_RangeRecord* rr = cf2->RangeRecord; ! /* binary search */ ! if ( cf2->RangeCount == 0 ) ! return TTO_Err_Not_Covered; ! ! new_min = 0; ! new_max = cf2->RangeCount - 1; do { + min = new_min; + max = new_max; /* we use (min + max) / 2 = max - (max - min) / 2 to avoid *************** *** 961,978 **** middle = max - ( ( max - min ) >> 1 ); ! if ( glyphID >= middle->Start && glyphID <= middle->End ) { ! *index = middle->StartCoverageIndex + glyphID - middle->Start; return TT_Err_Ok; } ! else if ( glyphID < middle->Start ) { ! max = middle - 1; } else { ! min = middle + 1; } ! } while ( min <= max ); return TTO_Err_Not_Covered; --- 1005,1026 ---- middle = max - ( ( max - min ) >> 1 ); ! if ( glyphID >= rr[middle].Start && glyphID <= rr[middle].End ) { ! *index = rr[middle].StartCoverageIndex + glyphID - rr[middle].Start; return TT_Err_Ok; } ! else if ( glyphID < rr[middle].Start ) { ! if ( middle == min ) ! break; ! new_max = middle - 1; } else { ! if ( middle == max ) ! break; ! new_min = middle + 1; } ! } while ( min < max ); return TTO_Err_Not_Covered; *************** *** 984,992 **** FT_UShort* index ) { ! if ( c->CoverageFormat == 1 ) return Coverage_Index1( &c->cf.cf1, glyphID, index ); ! else if ( c->CoverageFormat == 2 ) return Coverage_Index2( &c->cf.cf2, glyphID, index ); ! return TTO_Err_Invalid_SubTable_Format; } --- 1032,1048 ---- FT_UShort* index ) { ! switch ( c->CoverageFormat ) ! { ! case 1: return Coverage_Index1( &c->cf.cf1, glyphID, index ); ! ! case 2: return Coverage_Index2( &c->cf.cf2, glyphID, index ); ! ! default: ! return TTO_Err_Invalid_SubTable_Format; ! } ! ! return TT_Err_Ok; /* never reached */ } *************** *** 1234,1243 **** ! static inline FT_Error Get_Class1( TTO_ClassDefFormat1* cdf1, FT_UShort glyphID, ! FT_UShort* klass, FT_UShort* index ) { ! if (index) *index = 0; --- 1290,1302 ---- ! static FT_Error Get_Class1( TTO_ClassDefFormat1* cdf1, FT_UShort glyphID, ! FT_UShort* class, FT_UShort* index ) { ! FT_UShort* cva = cdf1->ClassValueArray; ! ! ! if ( index ) *index = 0; *************** *** 1245,1253 **** glyphID <= cdf1->StartGlyph + cdf1->GlyphCount ) { ! *klass = cdf1->ClassValueArray[glyphID - cdf1->StartGlyph]; return TT_Err_Ok; } ! *klass = 0; ! return TTO_Err_Not_Covered; } --- 1304,1315 ---- glyphID <= cdf1->StartGlyph + cdf1->GlyphCount ) { ! *class = cva[glyphID - cdf1->StartGlyph]; return TT_Err_Ok; } ! else ! { ! *class = 0; ! return TTO_Err_Not_Covered; ! } } *************** *** 1256,1278 **** in case of failure for constructed GDEF tables */ ! static inline FT_Error Get_Class2( TTO_ClassDefFormat2* cdf2, FT_UShort glyphID, ! FT_UShort* klass, FT_UShort* index ) { ! FT_Error error = TTO_Err_Not_Covered; ! int min, max, middle; TTO_ClassRangeRecord* crr = cdf2->ClassRangeRecord; - *klass = 0; /* binary search */ ! min = 0; ! max = cdf2->ClassRangeCount - 1; do { /* we use (min + max) / 2 = max - (max - min) / 2 to avoid overflow and rounding errors */ --- 1318,1351 ---- in case of failure for constructed GDEF tables */ ! static FT_Error Get_Class2( TTO_ClassDefFormat2* cdf2, FT_UShort glyphID, ! FT_UShort* class, FT_UShort* index ) { ! FT_Error error = TT_Err_Ok; ! FT_UShort min, max, new_min, new_max, middle; TTO_ClassRangeRecord* crr = cdf2->ClassRangeRecord; /* binary search */ ! if ( cdf2->ClassRangeCount == 0 ) ! { ! *class = 0; ! if ( index ) ! *index = 0; ! ! return TTO_Err_Not_Covered; ! } ! ! new_min = 0; ! new_max = cdf2->ClassRangeCount - 1; do { + min = new_min; + max = new_max; + /* we use (min + max) / 2 = max - (max - min) / 2 to avoid overflow and rounding errors */ *************** *** 1282,1299 **** if ( glyphID >= crr[middle].Start && glyphID <= crr[middle].End ) { ! *klass = crr[middle].Class; ! return TT_Err_Ok; } else if ( glyphID < crr[middle].Start ) { ! max = middle - 1; } else { ! min = middle + 1; } ! } while ( min <= max ); - *klass = 0; if ( index ) *index = middle; --- 1355,1384 ---- if ( glyphID >= crr[middle].Start && glyphID <= crr[middle].End ) { ! *class = crr[middle].Class; ! error = TT_Err_Ok; ! break; } else if ( glyphID < crr[middle].Start ) { ! if ( middle == min ) ! { ! *class = 0; ! error = TTO_Err_Not_Covered; ! break; ! } ! new_max = middle - 1; } else { ! if ( middle == max ) ! { ! *class = 0; ! error = TTO_Err_Not_Covered; ! break; ! } ! new_min = middle + 1; } ! } while ( min < max ); if ( index ) *index = middle; *************** *** 1303,1316 **** ! inline FT_Error Get_Class( TTO_ClassDefinition* cd, FT_UShort glyphID, ! FT_UShort* klass, FT_UShort* index ) { ! if ( cd->ClassFormat == 1 ) ! return Get_Class1( &cd->cd.cd1, glyphID, klass, index ); ! else if ( cd->ClassFormat == 2 ) ! return Get_Class2( &cd->cd.cd2, glyphID, klass, index ); ! return TTO_Err_Invalid_SubTable_Format; } --- 1388,1409 ---- ! FT_Error Get_Class( TTO_ClassDefinition* cd, FT_UShort glyphID, ! FT_UShort* class, FT_UShort* index ) { ! switch ( cd->ClassFormat ) ! { ! case 1: ! return Get_Class1( &cd->cd.cd1, glyphID, class, index ); ! ! case 2: ! return Get_Class2( &cd->cd.cd2, glyphID, class, index ); ! ! default: ! return TTO_Err_Invalid_SubTable_Format; ! } ! ! return TT_Err_Ok; /* never reached */ } Index: ftxopen.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxopen.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ftxopen.h 10 Feb 2005 20:49:41 -0000 1.4 --- ftxopen.h 21 Aug 2006 20:06:29 -0000 1.5 *************** *** 30,39 **** #endif ! #ifndef EXPORT_DEF ! #define EXPORT_DEF ! #endif ! #ifndef EXPORT_FUNC #define EXPORT_FUNC - #endif #define TTO_MAX_NESTING_LEVEL 100 --- 30,35 ---- #endif ! #define EXPORT_DEF #define EXPORT_FUNC #define TTO_MAX_NESTING_LEVEL 100 *************** *** 44,47 **** --- 40,44 ---- #define TTO_Err_Too_Many_Nested_Contexts 0x1003 #define TTO_Err_No_MM_Interpreter 0x1004 + #define TTO_Err_Empty_Script 0x1005 *************** *** 121,124 **** --- 118,123 ---- FT_UShort FeatureCount; /* number of FeatureRecords */ TTO_FeatureRecord* FeatureRecord; /* array of FeatureRecords */ + FT_UShort* ApplyOrder; /* order to apply features */ + FT_UShort ApplyCount; /* number of elements in ApplyOrder */ }; *************** *** 154,157 **** --- 153,157 ---- FT_UShort LookupCount; /* number of Lookups */ TTO_Lookup* Lookup; /* array of Lookup records */ + FT_UInt* Properties; /* array of flags */ }; *************** *** 283,286 **** --- 283,287 ---- + #include "otlbuffer.h" #include "ftxgdef.h" #include "ftxgsub.h" Index: ftxopenf.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxopenf.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxopenf.h 23 Oct 2004 15:06:46 -0000 1.3 --- ftxopenf.h 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 45,49 **** FT_Stream input ); ! void Free_ScriptList( TTO_ScriptList* sl, FT_Memory memory ); void Free_FeatureList( TTO_FeatureList* fl, --- 45,49 ---- FT_Stream input ); ! void Free_ScriptList( TTO_ScriptList* sl, FT_Memory memory ); void Free_FeatureList( TTO_FeatureList* fl, *************** *** 132,136 **** FT_Error Get_Class( TTO_ClassDefinition* cd, FT_UShort glyphID, ! FT_UShort* klass, FT_UShort* index ); FT_Error Get_Device( TTO_Device* d, --- 132,136 ---- FT_Error Get_Class( TTO_ClassDefinition* cd, FT_UShort glyphID, ! FT_UShort* class, FT_UShort* index ); FT_Error Get_Device( TTO_Device* d, *************** *** 146,150 **** FT_Error Check_Property( TTO_GDEFHeader* gdef, ! FT_UShort index, FT_UShort flags, FT_UShort* property ); --- 146,150 ---- FT_Error Check_Property( TTO_GDEFHeader* gdef, ! OTL_GlyphItem item, FT_UShort flags, FT_UShort* property ); Index: ftxopentype.c =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/3rdparty/opentype/ftxopentype.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ftxopentype.c 23 Oct 2004 15:06:46 -0000 1.3 --- ftxopentype.c 21 Aug 2006 20:06:29 -0000 1.4 *************** *** 1,6 **** --- 1,14 ---- /* we need to all the OT support into one file to get efficient inlining */ + #if defined(__GNUC__) + #define inline __inline__ + #else + #define inline + #endif + + #include "ftglue.c" #include "ftxopen.c" #include "ftxgdef.c" #include "ftxgpos.c" #include "ftxgsub.c" + #include "otlbuffer.c" |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:19
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/macx-pbuilder In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/macx-pbuilder Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:19
|
Update of /cvsroot/facturalux/lite/src/qsa/src/custom In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qsa/src/custom Modified Files: quickcolorbutton.cpp quickcolorbutton.h quickcustom.cpp quickcustom.h quickpaintwidget.cpp quickpaintwidget.h Log Message: Version 2.1 cerrada Index: quickcolorbutton.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qsa/src/custom/quickcolorbutton.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** quickcolorbutton.cpp 17 Feb 2006 11:32:47 -0000 1.7 --- quickcolorbutton.cpp 21 Aug 2006 20:06:24 -0000 1.8 *************** *** 2,6 **** ** $Id$ ** ! ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). --- 2,6 ---- ** $Id$ ** ! ** Copyright (C) 2001-2006 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). Index: quickcolorbutton.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qsa/src/custom/quickcolorbutton.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** quickcolorbutton.h 17 Feb 2006 11:32:47 -0000 1.7 --- quickcolorbutton.h 21 Aug 2006 20:06:24 -0000 1.8 *************** *** 2,6 **** ** $Id$ ** ! ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). --- 2,6 ---- ** $Id$ ** ! ** Copyright (C) 2001-2006 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). Index: quickcustom.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qsa/src/custom/quickcustom.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** quickcustom.cpp 17 Feb 2006 11:32:47 -0000 1.7 --- quickcustom.cpp 21 Aug 2006 20:06:24 -0000 1.8 *************** *** 2,6 **** ** $Id$ ** ! ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). --- 2,6 ---- ** $Id$ ** ! ** Copyright (C) 2001-2006 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). Index: quickcustom.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qsa/src/custom/quickcustom.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** quickcustom.h 17 Feb 2006 11:32:47 -0000 1.7 --- quickcustom.h 21 Aug 2006 20:06:24 -0000 1.8 *************** *** 2,6 **** ** $Id$ ** ! ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). --- 2,6 ---- ** $Id$ ** ! ** Copyright (C) 2001-2006 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). Index: quickpaintwidget.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qsa/src/custom/quickpaintwidget.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** quickpaintwidget.cpp 17 Feb 2006 11:32:47 -0000 1.7 --- quickpaintwidget.cpp 21 Aug 2006 20:06:24 -0000 1.8 *************** *** 2,6 **** ** $Id$ ** ! ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). --- 2,6 ---- ** $Id$ ** ! ** Copyright (C) 2001-2006 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). Index: quickpaintwidget.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qsa/src/custom/quickpaintwidget.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** quickpaintwidget.h 17 Feb 2006 11:32:47 -0000 1.7 --- quickpaintwidget.h 21 Aug 2006 20:06:24 -0000 1.8 *************** *** 2,6 **** ** $Id$ ** ! ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). --- 2,6 ---- ** $Id$ ** ! ** Copyright (C) 2001-2006 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Script for Applications framework (QSA). |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:18
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/unixware-cc In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/unixware-cc Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:17
|
Update of /cvsroot/facturalux/lite/src/qt/tools/designer/shared In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/tools/designer/shared Modified Files: uib.h Log Message: Version 2.1 cerrada Index: uib.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/tools/designer/shared/uib.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** uib.h 9 Nov 2005 08:59:00 -0000 1.4 --- uib.h 21 Aug 2006 20:06:43 -0000 1.5 *************** *** 95,99 **** } else { int nextPos = table.size(); ! int len = strlen( cstr ); int i; for ( i = 0; i < nextPos - len; i++ ) { --- 95,99 ---- } else { int nextPos = table.size(); ! int len = (int)strlen( cstr ); int i; for ( i = 0; i < nextPos - len; i++ ) { |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:16
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/sco-g++ In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/sco-g++ Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:16
|
Update of /cvsroot/facturalux/lite/src/qt/tools/designer/uic In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/tools/designer/uic Modified Files: embed.cpp main.cpp Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:14
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/irix-cc-o32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/irix-cc-o32 Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:11
|
Update of /cvsroot/facturalux/lite/src/qt/config.tests/unix/ptrsize In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/config.tests/unix/ptrsize Modified Files: ptrsizetest Log Message: Version 2.1 cerrada Index: ptrsizetest =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/config.tests/unix/ptrsize/ptrsizetest,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 Binary files /tmp/cvsXS1oFY and /tmp/cvs7k06qB differ |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:09
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/irix-cc-64 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/irix-cc-64 Modified Files: qmake.conf Log Message: Version 2.1 cerrada |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:06
|
Update of /cvsroot/facturalux/lite/src/qt/qmake/generators/win32 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/qmake/generators/win32 Modified Files: borland_bmake.cpp borland_bmake.h mingw_make.cpp mingw_make.h msvc_dsp.cpp msvc_dsp.h msvc_nmake.cpp msvc_nmake.h msvc_objectmodel.cpp msvc_objectmodel.h msvc_vcproj.cpp msvc_vcproj.h winmakefile.cpp winmakefile.h Log Message: Version 2.1 cerrada |
Update of /cvsroot/facturalux/lite/src/qt/src/tools In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/src/tools Modified Files: qasciicache.h qasciidict.h qbitarray.cpp qbitarray.h qbuffer.cpp qbuffer.h qcache.h qcleanuphandler.h qcom_p.h qcomlibrary.cpp qcomlibrary_p.h qcomponentfactory.cpp qcomponentfactory_p.h qcriticalsection_p.cpp qcriticalsection_p.h qcstring.cpp qcstring.h qdatastream.cpp qdatastream.h qdatetime.cpp qdatetime.h qdeepcopy.cpp qdeepcopy.h qdict.h qdir.cpp qdir.h qdir_p.h qdir_unix.cpp qfile.cpp qfile.h qfile_unix.cpp qfiledefs_p.h qfileinfo.cpp qfileinfo.h qfileinfo_unix.cpp qgarray.cpp qgarray.h qgcache.cpp qgcache.h qgdict.cpp qgdict.h qgeneric.h qglist.cpp qglist.h qglobal.cpp qglobal.h qgpluginmanager.cpp qgpluginmanager_p.h qgvector.cpp qgvector.h qintcache.h qintdict.h qiodevice.cpp qiodevice.h qlibrary.cpp qlibrary.h qlibrary_p.h qlibrary_unix.cpp qlocale.cpp qlocale.h qlocale_p.h qmap.cpp qmap.h qmemarray.h qmutex.h qmutex_p.h qmutex_unix.cpp qmutexpool.cpp qmutexpool_p.h qpluginmanager_p.h qptrcollection.cpp qptrdict.h qptrlist.h qptrqueue.h qptrstack.h qptrvector.h qregexp.cpp qregexp.h qsemaphore.cpp qsemaphore.h qsettings.cpp qsettings.h qsettings_p.h qshared.h qsortedlist.h qstring.cpp qstring.h qstringlist.cpp qstringlist.h qstrlist.h qstrvec.h qtextstream.cpp qtextstream.h qthreadinstance_p.h qthreadstorage.h qthreadstorage_unix.cpp qtl.h qucom.cpp qucom_p.h qunicodetables.cpp qunicodetables_p.h quuid.cpp quuid.h qvaluelist.h qvaluestack.h qvaluevector.h qwaitcondition.h qwaitcondition_unix.cpp qwinexport.h Log Message: Version 2.1 cerrada Index: qcom_p.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qcom_p.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qcom_p.h 17 Feb 2006 11:32:56 -0000 1.11 --- qcom_p.h 21 Aug 2006 20:06:40 -0000 1.12 *************** *** 54,57 **** --- 54,61 ---- #endif // QT_H + #if __GNUC__ - 0 > 3 + #pragma GCC system_header + #endif + #ifndef QT_NO_COMPONENT Index: qfile.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qfile.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qfile.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qfile.cpp 21 Aug 2006 20:06:40 -0000 1.12 *************** *** 308,313 **** void QFile::flush() { ! if ( isOpen() && fh ) // can only flush open/buffered ! fflush( fh ); // file } --- 308,320 ---- void QFile::flush() { ! if ( isOpen() && fh ) { // can only flush open/buffered file ! if ( fflush( fh ) ) { // write error ! if ( errno == ENOSPC ) // disk is full ! setStatus( IO_ResourceError ); ! else ! setStatus( IO_WriteError ); ! setErrorStringErrno( errno ); ! } ! } } Index: qglobal.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qglobal.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qglobal.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qglobal.cpp 21 Aug 2006 20:06:40 -0000 1.12 *************** *** 319,322 **** --- 319,324 ---- if ( osver.dwMajorVersion < 5 ) { winver = Qt::WV_NT; + } else if (osver.dwMajorVersion == 6) { + winver = Qt::WV_VISTA; } else if ( osver.dwMinorVersion == 0 ) { winver = Qt::WV_2000; Index: qglobal.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qglobal.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qglobal.h 17 Feb 2006 11:32:56 -0000 1.11 --- qglobal.h 21 Aug 2006 20:06:40 -0000 1.12 *************** *** 39,47 **** #define QGLOBAL_H ! #define QT_VERSION_STR "3.3.5" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ ! #define QT_VERSION 0x030305 /* --- 39,47 ---- #define QGLOBAL_H ! #define QT_VERSION_STR "3.3.6" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ ! #define QT_VERSION 0x030306 /* *************** *** 172,175 **** --- 172,192 ---- #endif + #if defined(Q_OS_MACX) + # ifdef MAC_OS_X_VERSION_MIN_REQUIRED + # undef MAC_OS_X_VERSION_MIN_REQUIRED + # endif + # define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_2 + # include <AvailabilityMacros.h> + # if !defined(MAC_OS_X_VERSION_10_3) + # define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1 + # endif + # if !defined(MAC_OS_X_VERSION_10_4) + # define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 + # endif + # if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4) + # error "This version of Mac OS X is unsupported" + # endif + #endif + /* Index: qgpluginmanager.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qgpluginmanager.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qgpluginmanager.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qgpluginmanager.cpp 21 Aug 2006 20:06:40 -0000 1.12 *************** *** 390,393 **** --- 390,394 ---- QPtrList<QComLibrary> same; same.setAutoDelete( TRUE ); + same.append( new QComLibrary( lib ) ); for ( QStringList::ConstIterator bit = sameBasename.begin(); bit != sameBasename.end(); ++bit ) Index: qlocale.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qlocale.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qlocale.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qlocale.cpp 21 Aug 2006 20:06:40 -0000 1.12 *************** *** 184,225 **** 0, // Bashkir 21, // Basque ! 0, // Bengali 0, // Bhutani 0, // Bihari 0, // Bislama 0, // Breton ! 22, // Bulgarian 0, // Burmese ! 23, // Byelorussian [...1270 lines suppressed...] ! 2528,// WesternSahara ! 2542,// Yemen ! 2548,// Yugoslavia ! 2559,// Zambia ! 2566// Zimbabwe }; *************** *** 1848,1852 **** long id = 0; bool ok = false; ! id = qstrtoll(lang.data(), 0, 0, &ok); if ( !ok || id == 0 || id < INT_MIN || id > INT_MAX ) return lang; --- 1849,1853 ---- long id = 0; bool ok = false; ! id = qstrtoll(lang.data(), 0, 0, &ok); if ( !ok || id == 0 || id < INT_MIN || id > INT_MAX ) return lang; Index: qlocale.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qlocale.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qlocale.h 17 Feb 2006 11:32:56 -0000 1.11 --- qlocale.h 21 Aug 2006 20:06:40 -0000 1.12 *************** *** 47,436 **** public: enum Language { ! C = 1, ! Abkhazian = 2, ! Afan = 3, ! Afar = 4, ! Afrikaans = 5, ! Albanian = 6, ! Amharic = 7, ! Arabic = 8, ! Armenian = 9, ! Assamese = 10, ! Aymara = 11, ! Azerbaijani = 12, ! Bashkir = 13, ! Basque = 14, ! Bengali = 15, ! Bhutani = 16, ! Bihari = 17, ! Bislama = 18, ! Breton = 19, ! Bulgarian = 20, ! Burmese = 21, ! Byelorussian = 22, ! Cambodian = 23, ! Catalan = 24, ! Chinese = 25, ! Corsican = 26, ! Croatian = 27, ! Czech = 28, ! Danish = 29, ! Dutch = 30, ! English = 31, ! Esperanto = 32, ! Estonian = 33, ! Faroese = 34, ! FijiLanguage = 35, ! Finnish = 36, ! French = 37, ! Frisian = 38, ! Gaelic = 39, ! Galician = 40, ! Georgian = 41, ! German = 42, ! Greek = 43, ! Greenlandic = 44, ! Guarani = 45, ! Gujarati = 46, ! Hausa = 47, ! Hebrew = 48, ! Hindi = 49, ! Hungarian = 50, ! Icelandic = 51, ! Indonesian = 52, ! Interlingua = 53, ! Interlingue = 54, ! Inuktitut = 55, ! Inupiak = 56, ! Irish = 57, ! Italian = 58, ! Japanese = 59, ! Javanese = 60, ! Kannada = 61, ! Kashmiri = 62, ! Kazakh = 63, ! Kinyarwanda = 64, ! Kirghiz = 65, ! Korean = 66, ! Kurdish = 67, ! Kurundi = 68, ! Laothian = 69, ! Latin = 70, ! Latvian = 71, ! Lingala = 72, ! Lithuanian = 73, ! Macedonian = 74, ! Malagasy = 75, ! Malay = 76, ! Malayalam = 77, ! Maltese = 78, ! Maori = 79, ! Marathi = 80, ! Moldavian = 81, ! Mongolian = 82, ! NauruLanguage = 83, ! Nepali = 84, ! Norwegian = 85, ! Occitan = 86, ! Oriya = 87, ! Pashto = 88, ! Persian = 89, ! Polish = 90, ! Portuguese = 91, ! Punjabi = 92, ! Quechua = 93, ! RhaetoRomance = 94, ! Romanian = 95, ! Russian = 96, ! Samoan = 97, ! Sangho = 98, ! Sanskrit = 99, ! Serbian = 100, ! SerboCroatian = 101, ! Sesotho = 102, ! Setswana = 103, ! Shona = 104, ! Sindhi = 105, ! Singhalese = 106, ! Siswati = 107, ! Slovak = 108, ! Slovenian = 109, ! Somali = 110, ! Spanish = 111, ! Sundanese = 112, ! Swahili = 113, ! Swedish = 114, ! Tagalog = 115, ! Tajik = 116, ! Tamil = 117, ! Tatar = 118, ! Telugu = 119, ! Thai = 120, ! Tibetan = 121, ! Tigrinya = 122, ! TongaLanguage = 123, ! Tsonga = 124, ! Turkish = 125, ! Turkmen = 126, ! Twi = 127, ! Uigur = 128, ! Ukrainian = 129, ! Urdu = 130, ! Uzbek = 131, ! Vietnamese = 132, ! Volapuk = 133, ! Welsh = 134, ! Wolof = 135, ! Xhosa = 136, ! Yiddish = 137, ! Yoruba = 138, ! Zhuang = 139, ! Zulu = 140, ! LastLanguage = Zulu }; enum Country { ! AnyCountry = 0, ! Afghanistan = 1, ! Albania = 2, ! Algeria = 3, ! AmericanSamoa = 4, ! Andorra = 5, ! Angola = 6, ! Anguilla = 7, ! Antarctica = 8, ! AntiguaAndBarbuda = 9, ! Argentina = 10, ! Armenia = 11, ! Aruba = 12, ! Australia = 13, ! Austria = 14, ! Azerbaijan = 15, ! Bahamas = 16, ! Bahrain = 17, ! Bangladesh = 18, ! Barbados = 19, ! Belarus = 20, ! Belgium = 21, ! Belize = 22, ! Benin = 23, ! Bermuda = 24, ! Bhutan = 25, ! Bolivia = 26, ! BosniaAndHerzegowina = 27, ! Botswana = 28, ! BouvetIsland = 29, ! Brazil = 30, ! BritishIndianOceanTerritory = 31, ! BruneiDarussalam = 32, ! Bulgaria = 33, ! BurkinaFaso = 34, ! Burundi = 35, ! Cambodia = 36, ! Cameroon = 37, ! Canada = 38, ! CapeVerde = 39, ! CaymanIslands = 40, ! CentralAfricanRepublic = 41, ! Chad = 42, ! Chile = 43, ! China = 44, ! ChristmasIsland = 45, ! CocosIslands = 46, ! Colombia = 47, ! Comoros = 48, ! DemocraticRepublicOfCongo = 49, ! PeoplesRepublicOfCongo = 50, ! CookIslands = 51, ! CostaRica = 52, ! IvoryCoast = 53, ! Croatia = 54, ! Cuba = 55, ! Cyprus = 56, ! CzechRepublic = 57, ! Denmark = 58, ! Djibouti = 59, ! Dominica = 60, ! DominicanRepublic = 61, ! EastTimor = 62, ! Ecuador = 63, ! Egypt = 64, ! ElSalvador = 65, ! EquatorialGuinea = 66, ! Eritrea = 67, ! Estonia = 68, ! Ethiopia = 69, ! FalklandIslands = 70, ! FaroeIslands = 71, ! FijiCountry = 72, ! Finland = 73, ! France = 74, ! MetropolitanFrance = 75, ! FrenchGuiana = 76, ! FrenchPolynesia = 77, ! FrenchSouthernTerritories = 78, ! Gabon = 79, ! Gambia = 80, ! Georgia = 81, ! Germany = 82, ! Ghana = 83, ! Gibraltar = 84, ! Greece = 85, ! Greenland = 86, ! Grenada = 87, ! Guadeloupe = 88, ! Guam = 89, ! Guatemala = 90, ! Guinea = 91, ! GuineaBissau = 92, ! Guyana = 93, ! Haiti = 94, ! HeardAndMcDonaldIslands = 95, ! Honduras = 96, ! HongKong = 97, ! Hungary = 98, ! Iceland = 99, ! India = 100, ! Indonesia = 101, ! Iran = 102, ! Iraq = 103, ! Ireland = 104, ! Israel = 105, ! Italy = 106, ! Jamaica = 107, ! Japan = 108, ! Jordan = 109, ! Kazakhstan = 110, ! Kenya = 111, ! Kiribati = 112, ! DemocraticRepublicOfKorea = 113, ! RepublicOfKorea = 114, ! Kuwait = 115, ! Kyrgyzstan = 116, ! Lao = 117, ! Latvia = 118, ! Lebanon = 119, ! Lesotho = 120, ! Liberia = 121, ! LibyanArabJamahiriya = 122, ! Liechtenstein = 123, ! Lithuania = 124, ! Luxembourg = 125, ! Macau = 126, ! Macedonia = 127, ! Madagascar = 128, ! Malawi = 129, ! Malaysia = 130, ! Maldives = 131, ! Mali = 132, ! Malta = 133, ! MarshallIslands = 134, ! Martinique = 135, ! Mauritania = 136, ! Mauritius = 137, ! Mayotte = 138, ! Mexico = 139, ! Micronesia = 140, ! Moldova = 141, ! Monaco = 142, ! Mongolia = 143, ! Montserrat = 144, ! Morocco = 145, ! Mozambique = 146, ! Myanmar = 147, ! Namibia = 148, ! NauruCountry = 149, ! Nepal = 150, ! Netherlands = 151, ! NetherlandsAntilles = 152, ! NewCaledonia = 153, ! NewZealand = 154, ! Nicaragua = 155, ! Niger = 156, ! Nigeria = 157, ! Niue = 158, ! NorfolkIsland = 159, ! NorthernMarianaIslands = 160, ! Norway = 161, ! Oman = 162, ! Pakistan = 163, ! Palau = 164, ! PalestinianTerritory = 165, ! Panama = 166, ! PapuaNewGuinea = 167, ! Paraguay = 168, ! Peru = 169, ! Philippines = 170, ! Pitcairn = 171, ! Poland = 172, ! Portugal = 173, ! PuertoRico = 174, ! Qatar = 175, ! Reunion = 176, ! Romania = 177, ! RussianFederation = 178, ! Rwanda = 179, ! SaintKittsAndNevis = 180, ! StLucia = 181, ! StVincentAndTheGrenadines = 182, ! Samoa = 183, ! SanMarino = 184, ! SaoTomeAndPrincipe = 185, ! SaudiArabia = 186, ! Senegal = 187, ! Seychelles = 188, ! SierraLeone = 189, ! Singapore = 190, ! Slovakia = 191, ! Slovenia = 192, ! SolomonIslands = 193, ! Somalia = 194, ! SouthAfrica = 195, ! SouthGeorgiaAndTheSouthSandwichIslands = 196, ! Spain = 197, ! SriLanka = 198, ! StHelena = 199, ! StPierreAndMiquelon = 200, ! Sudan = 201, ! Suriname = 202, ! SvalbardAndJanMayenIslands = 203, ! Swaziland = 204, ! Sweden = 205, ! Switzerland = 206, ! SyrianArabRepublic = 207, ! Taiwan = 208, ! Tajikistan = 209, ! Tanzania = 210, ! Thailand = 211, ! Togo = 212, ! Tokelau = 213, ! TongaCountry = 214, ! TrinidadAndTobago = 215, ! Tunisia = 216, ! Turkey = 217, ! Turkmenistan = 218, ! TurksAndCaicosIslands = 219, ! Tuvalu = 220, ! Uganda = 221, ! Ukraine = 222, ! UnitedArabEmirates = 223, ! UnitedKingdom = 224, ! UnitedStates = 225, ! UnitedStatesMinorOutlyingIslands = 226, ! Uruguay = 227, ! Uzbekistan = 228, ! Vanuatu = 229, ! VaticanCityState = 230, ! Venezuela = 231, ! VietNam = 232, ! BritishVirginIslands = 233, ! USVirginIslands = 234, ! WallisAndFutunaIslands = 235, ! WesternSahara = 236, ! Yemen = 237, ! Yugoslavia = 238, ! Zambia = 239, ! Zimbabwe = 240, ! LastCountry = Zimbabwe }; --- 47,436 ---- public: enum Language { ! C = 1, ! Abkhazian = 2, ! Afan = 3, ! Afar = 4, ! Afrikaans = 5, ! Albanian = 6, ! Amharic = 7, ! Arabic = 8, ! Armenian = 9, ! Assamese = 10, ! Aymara = 11, ! Azerbaijani = 12, ! Bashkir = 13, ! Basque = 14, ! Bengali = 15, ! Bhutani = 16, ! Bihari = 17, ! Bislama = 18, ! Breton = 19, ! Bulgarian = 20, ! Burmese = 21, ! Byelorussian = 22, ! Cambodian = 23, ! Catalan = 24, ! Chinese = 25, ! Corsican = 26, ! Croatian = 27, ! Czech = 28, ! Danish = 29, ! Dutch = 30, ! English = 31, ! Esperanto = 32, ! Estonian = 33, ! Faroese = 34, ! FijiLanguage = 35, ! Finnish = 36, ! French = 37, ! Frisian = 38, ! Gaelic = 39, ! Galician = 40, ! Georgian = 41, ! German = 42, ! Greek = 43, ! Greenlandic = 44, ! Guarani = 45, ! Gujarati = 46, ! Hausa = 47, ! Hebrew = 48, ! Hindi = 49, ! Hungarian = 50, ! Icelandic = 51, ! Indonesian = 52, ! Interlingua = 53, ! Interlingue = 54, ! Inuktitut = 55, ! Inupiak = 56, ! Irish = 57, ! Italian = 58, ! Japanese = 59, ! Javanese = 60, ! Kannada = 61, ! Kashmiri = 62, ! Kazakh = 63, ! Kinyarwanda = 64, ! Kirghiz = 65, ! Korean = 66, ! Kurdish = 67, ! Kurundi = 68, ! Laothian = 69, ! Latin = 70, ! Latvian = 71, ! Lingala = 72, ! Lithuanian = 73, ! Macedonian = 74, ! Malagasy = 75, ! Malay = 76, ! Malayalam = 77, ! Maltese = 78, ! Maori = 79, ! Marathi = 80, ! Moldavian = 81, ! Mongolian = 82, ! NauruLanguage = 83, ! Nepali = 84, ! Norwegian = 85, ! Occitan = 86, ! Oriya = 87, ! Pashto = 88, ! Persian = 89, ! Polish = 90, ! Portuguese = 91, ! Punjabi = 92, ! Quechua = 93, ! RhaetoRomance = 94, ! Romanian = 95, ! Russian = 96, ! Samoan = 97, ! Sangho = 98, ! Sanskrit = 99, ! Serbian = 100, ! SerboCroatian = 101, ! Sesotho = 102, ! Setswana = 103, ! Shona = 104, ! Sindhi = 105, ! Singhalese = 106, ! Siswati = 107, ! Slovak = 108, ! Slovenian = 109, ! Somali = 110, ! Spanish = 111, ! Sundanese = 112, ! Swahili = 113, ! Swedish = 114, ! Tagalog = 115, ! Tajik = 116, ! Tamil = 117, ! Tatar = 118, ! Telugu = 119, ! Thai = 120, ! Tibetan = 121, ! Tigrinya = 122, ! TongaLanguage = 123, ! Tsonga = 124, ! Turkish = 125, ! Turkmen = 126, ! Twi = 127, ! Uigur = 128, ! Ukrainian = 129, ! Urdu = 130, ! Uzbek = 131, ! Vietnamese = 132, ! Volapuk = 133, ! Welsh = 134, ! Wolof = 135, ! Xhosa = 136, ! Yiddish = 137, ! Yoruba = 138, ! Zhuang = 139, ! Zulu = 140, ! LastLanguage = Zulu }; enum Country { ! AnyCountry = 0, ! Afghanistan = 1, ! Albania = 2, ! Algeria = 3, ! AmericanSamoa = 4, ! Andorra = 5, ! Angola = 6, ! Anguilla = 7, ! Antarctica = 8, ! AntiguaAndBarbuda = 9, ! Argentina = 10, ! Armenia = 11, ! Aruba = 12, ! Australia = 13, ! Austria = 14, ! Azerbaijan = 15, ! Bahamas = 16, ! Bahrain = 17, ! Bangladesh = 18, ! Barbados = 19, ! Belarus = 20, ! Belgium = 21, ! Belize = 22, ! Benin = 23, ! Bermuda = 24, ! Bhutan = 25, ! Bolivia = 26, ! BosniaAndHerzegowina = 27, ! Botswana = 28, ! BouvetIsland = 29, ! Brazil = 30, ! BritishIndianOceanTerritory = 31, ! BruneiDarussalam = 32, ! Bulgaria = 33, ! BurkinaFaso = 34, ! Burundi = 35, ! Cambodia = 36, ! Cameroon = 37, ! Canada = 38, ! CapeVerde = 39, ! CaymanIslands = 40, ! CentralAfricanRepublic = 41, ! Chad = 42, ! Chile = 43, ! China = 44, ! ChristmasIsland = 45, ! CocosIslands = 46, ! Colombia = 47, ! Comoros = 48, ! DemocraticRepublicOfCongo = 49, ! PeoplesRepublicOfCongo = 50, ! CookIslands = 51, ! CostaRica = 52, ! IvoryCoast = 53, ! Croatia = 54, ! Cuba = 55, ! Cyprus = 56, ! CzechRepublic = 57, ! Denmark = 58, ! Djibouti = 59, ! Dominica = 60, ! DominicanRepublic = 61, ! EastTimor = 62, ! Ecuador = 63, ! Egypt = 64, ! ElSalvador = 65, ! EquatorialGuinea = 66, ! Eritrea = 67, ! Estonia = 68, ! Ethiopia = 69, ! FalklandIslands = 70, ! FaroeIslands = 71, ! FijiCountry = 72, ! Finland = 73, ! France = 74, ! MetropolitanFrance = 75, ! FrenchGuiana = 76, ! FrenchPolynesia = 77, ! FrenchSouthernTerritories = 78, ! Gabon = 79, ! Gambia = 80, ! Georgia = 81, ! Germany = 82, ! Ghana = 83, ! Gibraltar = 84, ! Greece = 85, ! Greenland = 86, ! Grenada = 87, ! Guadeloupe = 88, ! Guam = 89, ! Guatemala = 90, ! Guinea = 91, ! GuineaBissau = 92, ! Guyana = 93, ! Haiti = 94, ! HeardAndMcDonaldIslands = 95, ! Honduras = 96, ! HongKong = 97, ! Hungary = 98, ! Iceland = 99, ! India = 100, ! Indonesia = 101, ! Iran = 102, ! Iraq = 103, ! Ireland = 104, ! Israel = 105, ! Italy = 106, ! Jamaica = 107, ! Japan = 108, ! Jordan = 109, ! Kazakhstan = 110, ! Kenya = 111, ! Kiribati = 112, ! DemocraticRepublicOfKorea = 113, ! RepublicOfKorea = 114, ! Kuwait = 115, ! Kyrgyzstan = 116, ! Lao = 117, ! Latvia = 118, ! Lebanon = 119, ! Lesotho = 120, ! Liberia = 121, ! LibyanArabJamahiriya = 122, ! Liechtenstein = 123, ! Lithuania = 124, ! Luxembourg = 125, ! Macau = 126, ! Macedonia = 127, ! Madagascar = 128, ! Malawi = 129, ! Malaysia = 130, ! Maldives = 131, ! Mali = 132, ! Malta = 133, ! MarshallIslands = 134, ! Martinique = 135, ! Mauritania = 136, ! Mauritius = 137, ! Mayotte = 138, ! Mexico = 139, ! Micronesia = 140, ! Moldova = 141, ! Monaco = 142, ! Mongolia = 143, ! Montserrat = 144, ! Morocco = 145, ! Mozambique = 146, ! Myanmar = 147, ! Namibia = 148, ! NauruCountry = 149, ! Nepal = 150, ! Netherlands = 151, ! NetherlandsAntilles = 152, ! NewCaledonia = 153, ! NewZealand = 154, ! Nicaragua = 155, ! Niger = 156, ! Nigeria = 157, ! Niue = 158, ! NorfolkIsland = 159, ! NorthernMarianaIslands = 160, ! Norway = 161, ! Oman = 162, ! Pakistan = 163, ! Palau = 164, ! PalestinianTerritory = 165, ! Panama = 166, ! PapuaNewGuinea = 167, ! Paraguay = 168, ! Peru = 169, ! Philippines = 170, ! Pitcairn = 171, ! Poland = 172, ! Portugal = 173, ! PuertoRico = 174, ! Qatar = 175, ! Reunion = 176, ! Romania = 177, ! RussianFederation = 178, ! Rwanda = 179, ! SaintKittsAndNevis = 180, ! StLucia = 181, ! StVincentAndTheGrenadines = 182, ! Samoa = 183, ! SanMarino = 184, ! SaoTomeAndPrincipe = 185, ! SaudiArabia = 186, ! Senegal = 187, ! Seychelles = 188, ! SierraLeone = 189, ! Singapore = 190, ! Slovakia = 191, ! Slovenia = 192, ! SolomonIslands = 193, ! Somalia = 194, ! SouthAfrica = 195, ! SouthGeorgiaAndTheSouthSandwichIslands = 196, ! Spain = 197, ! SriLanka = 198, ! StHelena = 199, ! StPierreAndMiquelon = 200, ! Sudan = 201, ! Suriname = 202, ! SvalbardAndJanMayenIslands = 203, ! Swaziland = 204, ! Sweden = 205, ! Switzerland = 206, ! SyrianArabRepublic = 207, ! Taiwan = 208, ! Tajikistan = 209, ! Tanzania = 210, ! Thailand = 211, ! Togo = 212, ! Tokelau = 213, ! TongaCountry = 214, ! TrinidadAndTobago = 215, ! Tunisia = 216, ! Turkey = 217, ! Turkmenistan = 218, ! TurksAndCaicosIslands = 219, ! Tuvalu = 220, ! Uganda = 221, ! Ukraine = 222, ! UnitedArabEmirates = 223, ! UnitedKingdom = 224, ! UnitedStates = 225, ! UnitedStatesMinorOutlyingIslands = 226, ! Uruguay = 227, ! Uzbekistan = 228, ! Vanuatu = 229, ! VaticanCityState = 230, ! Venezuela = 231, ! VietNam = 232, ! BritishVirginIslands = 233, ! USVirginIslands = 234, ! WallisAndFutunaIslands = 235, ! WesternSahara = 236, ! Yemen = 237, ! Yugoslavia = 238, ! Zambia = 239, ! Zimbabwe = 240, ! LastCountry = Zimbabwe }; Index: qregexp.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qregexp.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qregexp.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qregexp.cpp 21 Aug 2006 20:06:41 -0000 1.12 *************** *** 122,125 **** --- 122,130 ---- go directly to the relevant information. + In case of multi-threaded programming, note that QRegExp depends on + QThreadStorage internally. For that reason, QRegExp should only be + used with threads started with QThread, i.e. not with threads + started with platform-specific APIs. + \tableofcontents Index: qsettings.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qsettings.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qsettings.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qsettings.cpp 21 Aug 2006 20:06:41 -0000 1.12 *************** *** 1481,1485 **** Removes the entry specified by \a key. ! Returns TRUE if the entry existed and was removed; otherwise returns FALSE. \sa readEntry(), writeEntry() --- 1481,1485 ---- Removes the entry specified by \a key. ! Returns FALSE if the entry was unable to be removed. \sa readEntry(), writeEntry() Index: qstring.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qstring.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qstring.cpp 17 Feb 2006 11:32:56 -0000 1.11 --- qstring.cpp 21 Aug 2006 20:06:41 -0000 1.12 *************** *** 4681,4684 **** --- 4681,4687 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4714,4717 **** --- 4717,4723 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4765,4768 **** --- 4771,4777 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4798,4801 **** --- 4807,4813 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4850,4853 **** --- 4862,4868 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4885,4888 **** --- 4900,4906 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4927,4930 **** --- 4945,4951 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4960,4963 **** --- 4981,4987 ---- Leading and trailing whitespace is ignored by this function. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \sa number() */ *************** *** 4985,4992 **** \endcode ! This function tries to interpret the string according to the ! current locale. The current locale is determined from the ! system at application startup and can be changed by calling ! QLocale::setDefault(). If the string cannot be interpreted according to the current locale, this function falls back on the "C" locale. --- 5009,5032 ---- \endcode ! The string-to-number functions: ! \list ! \i toShort() ! \i toUShort() ! \i toInt() ! \i toUInt() ! \i toLong() ! \i toULong() ! \i toLongLong() ! \i toULongLong() ! \i toFloat() ! \i toDouble() ! \endlist ! can handle numbers ! represented in various locales. These representations may use different ! characters for the decimal point, thousands group sepearator ! and even individual digits. QString's functions try to interpret ! the string according to the current locale. The current locale is ! determined from the system at application startup and can be changed ! by calling QLocale::setDefault(). If the string cannot be interpreted according to the current locale, this function falls back on the "C" locale. *************** *** 5006,5012 **** Due to the ambiguity between the decimal point and thousands group ! separator in various locales, this function does not handle thousands group separators. If you need to convert such numbers, ! see QLocale::toDouble(). \code --- 5046,5052 ---- Due to the ambiguity between the decimal point and thousands group ! separator in various locales, these functions do not handle thousands group separators. If you need to convert such numbers, ! use the corresponding function in QLocale. \code *************** *** 5063,5066 **** --- 5103,5109 ---- FALSE; otherwise \a *ok is set to TRUE. + For information on how string-to-number functions in QString handle + localized input, see toDouble(). + \warning If the string contains trailing whitespace this function will fail, settings \a *ok to false if \a ok is not 0. *************** *** 5088,5092 **** /*! Sets the string to the printed value of \a n in base \a base and ! returns a reference to the string. The base is 10 by default and must be between 2 and 36. --- 5131,5135 ---- /*! Sets the string to the printed value of \a n in base \a base and ! returns a reference to the string. The returned string is in "C" locale. The base is 10 by default and must be between 2 and 36. *************** *** 5258,5262 **** A convenience function that returns a string equivalent of the number \a n to base \a base, which is 10 by default and must be ! between 2 and 36. \code --- 5301,5305 ---- A convenience function that returns a string equivalent of the number \a n to base \a base, which is 10 by default and must be ! between 2 and 36. The returned string is in "C" locale. \code Index: qucom_p.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qucom_p.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qucom_p.h 17 Feb 2006 11:32:57 -0000 1.11 --- qucom_p.h 21 Aug 2006 20:06:41 -0000 1.12 *************** *** 60,63 **** --- 60,67 ---- #endif + #if __GNUC__ - 0 > 3 + #pragma GCC system_header + #endif + struct QUObject; struct QUInterfaceDescription; Index: qunicodetables.cpp =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qunicodetables.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qunicodetables.cpp 17 Feb 2006 11:32:57 -0000 1.11 --- qunicodetables.cpp 21 Aug 2006 20:06:41 -0000 1.12 *************** *** 12463,12467 **** 12, 12, 12, 12, 12, 12, 4, 12, 12, 12, 12, 12, 12, 4, 4, 12, ! 12, 12, 12, 4, 12, 4, 12, 12, 11, 11, 11, 11, 11, 12, 12, 12, --- 12463,12467 ---- 12, 12, 12, 12, 12, 12, 4, 12, 12, 12, 12, 12, 12, 4, 4, 12, ! 12, 12, 12, 4, 4, 4, 12, 12, 11, 11, 11, 11, 11, 12, 12, 12, *************** *** 13137,13141 **** 0x4f, Limbu, 0x7f, TaiLe, 0xdf, Unicode, 0xff, Khmer, #define SCRIPTS_20 60 ! 0x0b, Unicode, 0x0d, UnknownScript, 0x6f, Unicode, 0x9f, NumberForms, 0xab, CurrencySymbols, 0xac, Latin, 0xcf, CurrencySymbols, 0xff, CombiningMarks, // row 0x20, index 50 --- 13137,13141 ---- 0x4f, Limbu, 0x7f, TaiLe, 0xdf, Unicode, 0xff, Khmer, #define SCRIPTS_20 60 ! 0x0a, Unicode, 0x0d, UnknownScript, 0x6f, Unicode, 0x9f, NumberForms, 0xab, CurrencySymbols, 0xac, Latin, 0xcf, CurrencySymbols, 0xff, CombiningMarks, // row 0x20, index 50 Index: qvaluevector.h =================================================================== RCS file: /cvsroot/facturalux/lite/src/qt/src/tools/qvaluevector.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** qvaluevector.h 17 Feb 2006 11:32:57 -0000 1.11 --- qvaluevector.h 21 Aug 2006 20:06:41 -0000 1.12 *************** *** 120,124 **** : QShared() { ! int i = (int)x.size(); if ( i > 0 ) { start = new T[ i ]; --- 120,124 ---- : QShared() { ! size_t i = x.size(); if ( i > 0 ) { start = new T[ i ]; |
From: Federico A. Z. <fal...@us...> - 2006-08-21 21:03:02
|
Update of /cvsroot/facturalux/lite/src/qt/mkspecs/reliant-cds-64 In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32137/src/qt/mkspecs/reliant-cds-64 Modified Files: qmake.conf Log Message: Version 2.1 cerrada |