Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 114127 Details for
Bug 171883
x11-libs/qt-3.3.8 segfaults on exit when using mysql DB driver
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Source diff between 3.3.8 and 3.3.8-snapshot-20070323
3.3.8-snapshot-20070323.diff (text/plain), 119.74 KB, created by
Brad House
on 2007-03-23 14:27:15 UTC
(
hide
)
Description:
Source diff between 3.3.8 and 3.3.8-snapshot-20070323
Filename:
MIME Type:
Creator:
Brad House
Created:
2007-03-23 14:27:15 UTC
Size:
119.74 KB
patch
obsolete
>diff -ruN qt-x11-commercial-3.3.8/configure qt-x11-commercial-3.3.8-snapshot-20070323/configure >--- qt-x11-commercial-3.3.8/configure 2007-01-15 07:41:50.000000000 -0500 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/configure 2007-03-23 10:21:00.000000000 -0400 >@@ -2240,7 +2240,7 @@ > > $XFTN -no-xft ............ Do not compile Xft (anti-aliased font) support. > $XFTY -xft ............... Compile Xft support. >- Requires X11/Xft/XftFreetype.h and libXft. >+ Requires X11/Xft/Xft.h and libXft. > > $XIN -no-tablet ......... Do not compile Tablet support. > $XIY -tablet ............ Compile Tablet support. >diff -ruN qt-x11-commercial-3.3.8/include/qglobal.h qt-x11-commercial-3.3.8-snapshot-20070323/include/qglobal.h >--- qt-x11-commercial-3.3.8/include/qglobal.h 2007-03-23 10:21:30.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/include/qglobal.h 2007-03-23 10:20:59.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qglobal.h 3.3.8 edited Feb 2 15:00 $ >+** $Id: qt/qglobal.h 3.3.8 edited Mar 23 02:24 $ > ** > ** Global type declarations and definitions > ** >diff -ruN qt-x11-commercial-3.3.8/qmake/generators/unix/unixmake2.cpp qt-x11-commercial-3.3.8-snapshot-20070323/qmake/generators/unix/unixmake2.cpp >--- qt-x11-commercial-3.3.8/qmake/generators/unix/unixmake2.cpp 2007-03-23 10:21:36.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/qmake/generators/unix/unixmake2.cpp 2007-03-23 10:21:06.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/unixmake2.cpp 3.3.8 edited Jan 11 14:37 $ >+** $Id: qt/unixmake2.cpp 3.3.8 edited Feb 19 21:45 $ > ** > ** Implementation of UnixMakefileGenerator class. > ** >@@ -1587,4 +1587,5 @@ > << project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ") > // << varGlue("DEFINES","-D"," -D"," ") > << " -I${includedir}"; >+ t << endl; > } >diff -ruN qt-x11-commercial-3.3.8/src/codecs/qutfcodec.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/codecs/qutfcodec.cpp >--- qt-x11-commercial-3.3.8/src/codecs/qutfcodec.cpp 2007-03-23 10:21:31.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/codecs/qutfcodec.cpp 2007-03-23 10:21:11.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qutfcodec.cpp 3.3.8 edited Jan 11 14:46 $ >+** $Id: qt/qutfcodec.cpp 3.3.8 edited Mar 21 08:23 $ > ** > ** Implementation of QUtf{8,16}Codec class > ** >@@ -154,6 +154,7 @@ > > class QUtf8Decoder : public QTextDecoder { > uint uc; >+ uint min_uc; > int need; > bool headerDone; > public: >@@ -167,8 +168,9 @@ > result.setLength( len ); // worst case > QChar *qch = (QChar *)result.unicode(); > uchar ch; >+ int error = -1; > for (int i=0; i<len; i++) { >- ch = *chars++; >+ ch = chars[i]; > if (need) { > if ( (ch&0xc0) == 0x80 ) { > uc = (uc << 6) | (ch & 0x3f); >@@ -182,6 +184,8 @@ > *qch++ = QChar(high); > *qch++ = QChar(low); > headerDone = TRUE; >+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { >+ *qch++ = QChar::replacement; > } else { > if (headerDone || QChar(uc) != QChar::byteOrderMark) > *qch++ = uc; >@@ -190,6 +194,7 @@ > } > } else { > // error >+ i = error; > *qch++ = QChar::replacement; > need = 0; > } >@@ -200,13 +205,22 @@ > } else if ((ch & 0xe0) == 0xc0) { > uc = ch & 0x1f; > need = 1; >+ error = i; >+ min_uc = 0x80; > } else if ((ch & 0xf0) == 0xe0) { > uc = ch & 0x0f; > need = 2; >+ error = i; >+ min_uc = 0x800; > } else if ((ch&0xf8) == 0xf0) { > uc = ch & 0x07; > need = 3; >- } >+ error = i; >+ min_uc = 0x10000; >+ } else { >+ // error >+ *qch++ = QChar::replacement; >+ } > } > } > result.truncate( qch - result.unicode() ); >diff -ruN qt-x11-commercial-3.3.8/src/kernel/qprinter.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/kernel/qprinter.cpp >--- qt-x11-commercial-3.3.8/src/kernel/qprinter.cpp 2007-03-23 10:21:32.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/kernel/qprinter.cpp 2007-03-23 10:21:12.000000000 -0400 >@@ -1,5 +1,5 @@ > /********************************************************************** >-** $Id: qt/qprinter.cpp 3.3.8 edited Jan 11 14:38 $ >+** $Id: qt/qprinter.cpp 3.3.8 edited Mar 1 14:39 $ > ** > ** Implementation of QPrinter class > ** >@@ -124,10 +124,6 @@ > \omit Need a function to setup() without a dialog (i.e. use defaults). > \endomit > >- If your current locale converts "," to ".", you will need to set >- a locale (via the standard C setlocale() function) that doen't do this >- before using QPrinter. The "C" locale works well for this. >- > The TrueType font embedding for Qt's postscript driver uses code > by David Chappell of Trinity College Computing Center. > >diff -ruN qt-x11-commercial-3.3.8/src/kernel/qprocess.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/kernel/qprocess.cpp >--- qt-x11-commercial-3.3.8/src/kernel/qprocess.cpp 2007-03-23 10:21:32.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/kernel/qprocess.cpp 2007-03-23 10:21:12.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qprocess.cpp 3.3.8 edited Jan 11 14:38 $ >+** $Id: qt/qprocess.cpp 3.3.8 edited Mar 15 17:39 $ > ** > ** Implementation of QProcess class > ** >@@ -727,7 +727,7 @@ > void QProcess::writeToStdin( const QString& buf ) > { > QByteArray tmp = buf.local8Bit(); >- tmp.resize( tmp.size() - 1 ); // drop the implicit \0 >+ tmp.resize( qstrlen( tmp.data() ) ); > writeToStdin( tmp ); > } > >diff -ruN qt-x11-commercial-3.3.8/src/kernel/qscriptengine_x11.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/kernel/qscriptengine_x11.cpp >--- qt-x11-commercial-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-03-23 10:21:32.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/kernel/qscriptengine_x11.cpp 2007-03-23 10:21:12.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qscriptengine_x11.cpp 3.3.8 edited Jan 11 14:46 $ >+** $Id: qt/qscriptengine_x11.cpp 3.3.8 edited Mar 2 14:22 $ > ** > ** Copyright (C) 2003-2007 Trolltech ASA. All rights reserved. > ** >@@ -101,7 +101,7 @@ > static const unsigned char indicForms[0xe00-0x900] = { > // Devangari > Invalid, VowelMark, VowelMark, VowelMark, >- Invalid, IndependentVowel, IndependentVowel, IndependentVowel, >+ IndependentVowel, IndependentVowel, IndependentVowel, IndependentVowel, > IndependentVowel, IndependentVowel, IndependentVowel, IndependentVowel, > IndependentVowel, IndependentVowel, IndependentVowel, IndependentVowel, > >@@ -137,8 +137,8 @@ > > Other, Other, Other, Other, > Other, Other, Other, Other, >- Other, Other, Other, Other, >- Other, Other, Other, Other, >+ Other, Other, Other, Consonant, >+ Consonant, Consonant /* ??? */, Consonant, Consonant, > > // Bengali > Invalid, VowelMark, VowelMark, VowelMark, >@@ -182,7 +182,7 @@ > Other, Other, Other, Other, > > // Gurmukhi >- Invalid, Invalid, VowelMark, Invalid, >+ Invalid, VowelMark, VowelMark, VowelMark, > Invalid, IndependentVowel, IndependentVowel, IndependentVowel, > IndependentVowel, IndependentVowel, IndependentVowel, Invalid, > Invalid, Invalid, Invalid, IndependentVowel, >@@ -217,7 +217,7 @@ > Other, Other, Other, Other, > Other, Other, Other, Other, > >- StressMark, StressMark, Other, Other, >+ StressMark, StressMark, Consonant, Consonant, > Other, Other, Other, Other, > Other, Other, Other, Other, > Other, Other, Other, Other, >@@ -226,7 +226,7 @@ > Invalid, VowelMark, VowelMark, VowelMark, > Invalid, IndependentVowel, IndependentVowel, IndependentVowel, > IndependentVowel, IndependentVowel, IndependentVowel, IndependentVowel, >- Invalid, IndependentVowel, Invalid, IndependentVowel, >+ IndependentVowel, IndependentVowel, Invalid, IndependentVowel, > > IndependentVowel, IndependentVowel, Invalid, IndependentVowel, > IndependentVowel, Consonant, Consonant, Consonant, >@@ -253,7 +253,7 @@ > Unknown, Unknown, Unknown, Unknown, > Unknown, Unknown, Unknown, Unknown, > >- Other, Other, Other, Other, >+ IndependentVowel, IndependentVowel, VowelMark, VowelMark, > Other, Other, Other, Other, > Other, Other, Other, Other, > Other, Other, Other, Other, >@@ -280,7 +280,7 @@ > Consonant, Consonant, Consonant, Consonant, > > Consonant, Invalid, Consonant, Consonant, >- Invalid, Invalid, Consonant, Consonant, >+ Invalid, Consonant, Consonant, Consonant, > Consonant, Consonant, Unknown, Unknown, > Nukta, Other, Matra, Matra, > >@@ -299,7 +299,7 @@ > Other, Other, Other, Other, > Other, Other, Other, Other, > >- Other, Other, Other, Other, >+ Other, Consonant, Other, Other, > Other, Other, Other, Other, > Other, Other, Other, Other, > Other, Other, Other, Other, >@@ -321,7 +321,7 @@ > Invalid, Invalid, Consonant, Consonant, > > Consonant, Consonant, Consonant, Consonant, >- Consonant, Consonant, Invalid, Consonant, >+ Consonant, Consonant, Consonant, Consonant, > Consonant, Consonant, Unknown, Unknown, > Invalid, Invalid, Matra, Matra, > >@@ -405,7 +405,7 @@ > Consonant, Consonant, Consonant, Consonant, > Invalid, Consonant, Consonant, Consonant, > Consonant, Consonant, Unknown, Unknown, >- Invalid, Invalid, Matra, Matra, >+ Nukta, Other, Matra, Matra, > > Matra, Matra, Matra, Matra, > Matra, Invalid, Matra, Matra, >@@ -417,7 +417,7 @@ > Invalid, Invalid, Invalid, Invalid, > Invalid, Invalid, Consonant, Invalid, > >- IndependentVowel, IndependentVowel, Invalid, Invalid, >+ IndependentVowel, IndependentVowel, VowelMark, VowelMark, > Invalid, Invalid, Other, Other, > Other, Other, Other, Other, > Other, Other, Other, Other, >@@ -607,7 +607,7 @@ > None, None, None, None, > > // Gurmukhi >- None, None, Above, None, >+ None, Above, Above, Post, > None, None, None, None, > None, None, None, None, > None, None, None, None, >@@ -678,7 +678,7 @@ > None, None, None, None, > None, None, None, None, > >- None, None, None, None, >+ None, None, Below, Below, > None, None, None, None, > None, None, None, None, > None, None, None, None, >@@ -717,14 +717,14 @@ > None, None, None, None, > None, None, Above, Post, > None, None, None, None, >- None, None, None, None, >+ None, None, None, Post, > > None, None, None, None, > None, None, None, None, > None, None, None, None, > None, None, None, None, > >- None, None, None, None, >+ None, Below, None, None, > None, None, None, None, > None, None, None, None, > None, None, None, None, >@@ -842,7 +842,7 @@ > None, None, None, None, > None, None, Below, None, > >- None, None, None, None, >+ None, None, Below, Below, > None, None, None, None, > None, None, None, None, > None, None, None, None, >diff -ruN qt-x11-commercial-3.3.8/src/libqt.map qt-x11-commercial-3.3.8-snapshot-20070323/src/libqt.map >--- qt-x11-commercial-3.3.8/src/libqt.map 2007-03-23 10:21:31.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/libqt.map 2007-03-23 10:21:11.000000000 -0400 >@@ -2,17 +2,6 @@ > global: > extern "C++" > { >- QString::shared_null*; >- TID_QUType_Null*; >- TID_QUType_bool*; >- TID_QUType_charstar*; >- TID_QUType_double*; >- TID_QUType_enum*; >- TID_QUType_idisp*; >- TID_QUType_iface*; >- TID_QUType_int*; >- TID_QUType_ptr*; >- TID_QUType_varptr*; > bin*; > bitBlt*; > copyBlt*; >@@ -60,6 +49,7 @@ > qInstallPathSysconf*; > qInstallPathTranslations*; > qItemRect*; >+ qmemmove*; > qNetworkProtocolRegister*; > qObsolete*; > qRed*; >@@ -75,25 +65,18 @@ > qSmartMinSize*; > qSqlDriverExtDict*; > qSqlOpenExtDict*; >- qSuppressObsoleteWarnings*; >- qSysInfo*; >- qSystemWarning*; >- qUncompress*; >- qVersion*; >- qWarning*; >- qWinAppCmdShow*; >- qWinAppInst*; >- qWinAppPrevInst*; >- qWinProcessConfigRequests*; >- qmemmove*; > qstrcmp*; > qstrcpy*; > qstrdup*; > qstricmp*; >+ QString::shared_null*; > qstrlen*; > qstrncmp*; > qstrncpy*; > qstrnicmp*; >+ qSuppressObsoleteWarnings*; >+ qSysInfo*; >+ qSystemWarning*; > qt_bitblt_bsm*; > qt_check_pointer*; > qt_dispatchAccelEvent*; >@@ -112,11 +95,11 @@ > qt_qheader_label_return_null_strings*; > qt_resolve_symlinks*; > qt_setAccelAutoShortcuts*; >+ qt_set_postselect_handler*; >+ qt_set_preselect_handler*; > qt_setSettingsBasePath*; > qt_setSettingsTryLocal*; > qt_setSettingsTryUser*; >- qt_set_postselect_handler*; >- qt_set_preselect_handler*; > qt_set_win_event_filter*; > qt_set_win_event_filter_ex*; > qt_set_x11_event_filter*; >@@ -130,9 +113,9 @@ > qt_use_native_dialogs*; > qt_use_xrender*; > qt_wait_for_window_manager*; >+ qt_window_role*; > qt_win_ignoreNextMouseReleaseEvent*; > qt_win_use_simple_timers*; >- qt_window_role*; > qt_wm_delete_window*; > qt_wm_protocols*; > qt_wm_state*; >@@ -140,10 +123,14 @@ > qt_x11_enforce_cursor*; > qt_x_time*; > qt_x_user_time*; >+ qUncompress*; >+ qVersion*; >+ qWarning*; >+ qWinAppCmdShow*; >+ qWinAppInst*; >+ qWinAppPrevInst*; >+ qWinProcessConfigRequests*; > reset*; >- static_QUType_Null*; >- static_QUType_QString*; >- static_QUType_QVariant*; > static_QUType_bool*; > static_QUType_charstar*; > static_QUType_double*; >@@ -151,8 +138,21 @@ > static_QUType_idisp*; > static_QUType_iface*; > static_QUType_int*; >+ static_QUType_Null*; > static_QUType_ptr*; >+ static_QUType_QString*; >+ static_QUType_QVariant*; > static_QUType_varptr*; >+ TID_QUType_bool*; >+ TID_QUType_charstar*; >+ TID_QUType_double*; >+ TID_QUType_enum*; >+ TID_QUType_idisp*; >+ TID_QUType_iface*; >+ TID_QUType_int*; >+ TID_QUType_Null*; >+ TID_QUType_ptr*; >+ TID_QUType_varptr*; > warning*; > ws*; > operator*; >@@ -219,13 +219,6 @@ > vtable?for?QBitArray; > typeinfo?for?QBitArray; > non-virtual?thunk?to?QBitArray::*; >- QBitVal::*; >- QBitVal?virtual?table; >- QBitVal?type_info?node; >- QBitVal?type_info?function; >- vtable?for?QBitVal; >- typeinfo?for?QBitVal; >- non-virtual?thunk?to?QBitVal::*; > QBitmap::*; > QBitmap?virtual?table; > QBitmap?type_info?node; >@@ -233,6 +226,13 @@ > vtable?for?QBitmap; > typeinfo?for?QBitmap; > non-virtual?thunk?to?QBitmap::*; >+ QBitVal::*; >+ QBitVal?virtual?table; >+ QBitVal?type_info?node; >+ QBitVal?type_info?function; >+ vtable?for?QBitVal; >+ typeinfo?for?QBitVal; >+ non-virtual?thunk?to?QBitVal::*; > QBoxLayout::*; > QBoxLayout?virtual?table; > QBoxLayout?type_info?node; >@@ -275,13 +275,6 @@ > vtable?for?QCDEStyle; > typeinfo?for?QCDEStyle; > non-virtual?thunk?to?QCDEStyle::*; >- QCString::*; >- QCString?virtual?table; >- QCString?type_info?node; >- QCString?type_info?function; >- vtable?for?QCString; >- typeinfo?for?QCString; >- non-virtual?thunk?to?QCString::*; > QChar::*; > QChar?virtual?table; > QChar?type_info?node; >@@ -359,13 +352,6 @@ > vtable?for?QColorGroup; > typeinfo?for?QColorGroup; > non-virtual?thunk?to?QColorGroup::*; >- QComLibrary::*; >- QComLibrary?virtual?table; >- QComLibrary?type_info?node; >- QComLibrary?type_info?function; >- vtable?for?QComLibrary; >- typeinfo?for?QComLibrary; >- non-virtual?thunk?to?QComLibrary::*; > QComboBox::*; > QComboBox?virtual?table; > QComboBox?type_info?node; >@@ -373,6 +359,13 @@ > vtable?for?QComboBox; > typeinfo?for?QComboBox; > non-virtual?thunk?to?QComboBox::*; >+ QComLibrary::*; >+ QComLibrary?virtual?table; >+ QComLibrary?type_info?node; >+ QComLibrary?type_info?function; >+ vtable?for?QComLibrary; >+ typeinfo?for?QComLibrary; >+ non-virtual?thunk?to?QComLibrary::*; > QCommonStyle::*; > QCommonStyle?virtual?table; > QCommonStyle?type_info?node; >@@ -450,6 +443,13 @@ > vtable?for?QContextMenuEvent; > typeinfo?for?QContextMenuEvent; > non-virtual?thunk?to?QContextMenuEvent::*; >+ QCString::*; >+ QCString?virtual?table; >+ QCString?type_info?node; >+ QCString?type_info?function; >+ vtable?for?QCString; >+ typeinfo?for?QCString; >+ non-virtual?thunk?to?QCString::*; > QCursor::*; > QCursor?virtual?table; > QCursor?type_info?node; >@@ -471,13 +471,6 @@ > vtable?for?QCustomMenuItem; > typeinfo?for?QCustomMenuItem; > non-virtual?thunk?to?QCustomMenuItem::*; >- QDB2Driver::*; >- QDB2Driver?virtual?table; >- QDB2Driver?type_info?node; >- QDB2Driver?type_info?function; >- vtable?for?QDB2Driver; >- typeinfo?for?QDB2Driver; >- non-virtual?thunk?to?QDB2Driver::*; > QDataBrowser::*; > QDataBrowser?virtual?table; > QDataBrowser?type_info?node; >@@ -548,6 +541,13 @@ > vtable?for?QDateTimeEditBase; > typeinfo?for?QDateTimeEditBase; > non-virtual?thunk?to?QDateTimeEditBase::*; >+ QDB2Driver::*; >+ QDB2Driver?virtual?table; >+ QDB2Driver?type_info?node; >+ QDB2Driver?type_info?function; >+ vtable?for?QDB2Driver; >+ typeinfo?for?QDB2Driver; >+ non-virtual?thunk?to?QDB2Driver::*; > QDesktopWidget::*; > QDesktopWidget?virtual?table; > QDesktopWidget?type_info?node; >@@ -807,6 +807,27 @@ > vtable?for?QGArray; > typeinfo?for?QGArray; > non-virtual?thunk?to?QGArray::*; >+ QGb18030Codec::*; >+ QGb18030Codec?virtual?table; >+ QGb18030Codec?type_info?node; >+ QGb18030Codec?type_info?function; >+ vtable?for?QGb18030Codec; >+ typeinfo?for?QGb18030Codec; >+ non-virtual?thunk?to?QGb18030Codec::*; >+ QGb2312Codec::*; >+ QGb2312Codec?virtual?table; >+ QGb2312Codec?type_info?node; >+ QGb2312Codec?type_info?function; >+ vtable?for?QGb2312Codec; >+ typeinfo?for?QGb2312Codec; >+ non-virtual?thunk?to?QGb2312Codec::*; >+ QGbkCodec::*; >+ QGbkCodec?virtual?table; >+ QGbkCodec?type_info?node; >+ QGbkCodec?type_info?function; >+ vtable?for?QGbkCodec; >+ typeinfo?for?QGbkCodec; >+ non-virtual?thunk?to?QGbkCodec::*; > QGCache::*; > QGCache?virtual?table; > QGCache?type_info?node; >@@ -835,6 +856,34 @@ > vtable?for?QGDictIterator; > typeinfo?for?QGDictIterator; > non-virtual?thunk?to?QGDictIterator::*; >+ QGfx::*; >+ QGfx?virtual?table; >+ QGfx?type_info?node; >+ QGfx?type_info?function; >+ vtable?for?QGfx; >+ typeinfo?for?QGfx; >+ non-virtual?thunk?to?QGfx::*; >+ QGfxDriverFactory::*; >+ QGfxDriverFactory?virtual?table; >+ QGfxDriverFactory?type_info?node; >+ QGfxDriverFactory?type_info?function; >+ vtable?for?QGfxDriverFactory; >+ typeinfo?for?QGfxDriverFactory; >+ non-virtual?thunk?to?QGfxDriverFactory::*; >+ QGfxDriverInterface::*; >+ QGfxDriverInterface?virtual?table; >+ QGfxDriverInterface?type_info?node; >+ QGfxDriverInterface?type_info?function; >+ vtable?for?QGfxDriverInterface; >+ typeinfo?for?QGfxDriverInterface; >+ non-virtual?thunk?to?QGfxDriverInterface::*; >+ QGfxDriverPlugin::*; >+ QGfxDriverPlugin?virtual?table; >+ QGfxDriverPlugin?type_info?node; >+ QGfxDriverPlugin?type_info?function; >+ vtable?for?QGfxDriverPlugin; >+ typeinfo?for?QGfxDriverPlugin; >+ non-virtual?thunk?to?QGfxDriverPlugin::*; > QGLayoutIterator::*; > QGLayoutIterator?virtual?table; > QGLayoutIterator?type_info?node; >@@ -877,62 +926,6 @@ > vtable?for?QGPluginManager; > typeinfo?for?QGPluginManager; > non-virtual?thunk?to?QGPluginManager::*; >- QGVector::*; >- QGVector?virtual?table; >- QGVector?type_info?node; >- QGVector?type_info?function; >- vtable?for?QGVector; >- typeinfo?for?QGVector; >- non-virtual?thunk?to?QGVector::*; >- QGb18030Codec::*; >- QGb18030Codec?virtual?table; >- QGb18030Codec?type_info?node; >- QGb18030Codec?type_info?function; >- vtable?for?QGb18030Codec; >- typeinfo?for?QGb18030Codec; >- non-virtual?thunk?to?QGb18030Codec::*; >- QGb2312Codec::*; >- QGb2312Codec?virtual?table; >- QGb2312Codec?type_info?node; >- QGb2312Codec?type_info?function; >- vtable?for?QGb2312Codec; >- typeinfo?for?QGb2312Codec; >- non-virtual?thunk?to?QGb2312Codec::*; >- QGbkCodec::*; >- QGbkCodec?virtual?table; >- QGbkCodec?type_info?node; >- QGbkCodec?type_info?function; >- vtable?for?QGbkCodec; >- typeinfo?for?QGbkCodec; >- non-virtual?thunk?to?QGbkCodec::*; >- QGfx::*; >- QGfx?virtual?table; >- QGfx?type_info?node; >- QGfx?type_info?function; >- vtable?for?QGfx; >- typeinfo?for?QGfx; >- non-virtual?thunk?to?QGfx::*; >- QGfxDriverFactory::*; >- QGfxDriverFactory?virtual?table; >- QGfxDriverFactory?type_info?node; >- QGfxDriverFactory?type_info?function; >- vtable?for?QGfxDriverFactory; >- typeinfo?for?QGfxDriverFactory; >- non-virtual?thunk?to?QGfxDriverFactory::*; >- QGfxDriverInterface::*; >- QGfxDriverInterface?virtual?table; >- QGfxDriverInterface?type_info?node; >- QGfxDriverInterface?type_info?function; >- vtable?for?QGfxDriverInterface; >- typeinfo?for?QGfxDriverInterface; >- non-virtual?thunk?to?QGfxDriverInterface::*; >- QGfxDriverPlugin::*; >- QGfxDriverPlugin?virtual?table; >- QGfxDriverPlugin?type_info?node; >- QGfxDriverPlugin?type_info?function; >- vtable?for?QGfxDriverPlugin; >- typeinfo?for?QGfxDriverPlugin; >- non-virtual?thunk?to?QGfxDriverPlugin::*; > QGrid::*; > QGrid?virtual?table; > QGrid?type_info?node; >@@ -968,6 +961,13 @@ > vtable?for?QGuardedPtrPrivate; > typeinfo?for?QGuardedPtrPrivate; > non-virtual?thunk?to?QGuardedPtrPrivate::*; >+ QGVector::*; >+ QGVector?virtual?table; >+ QGVector?type_info?node; >+ QGVector?type_info?function; >+ vtable?for?QGVector; >+ typeinfo?for?QGVector; >+ non-virtual?thunk?to?QGVector::*; > QHBox::*; > QHBox?virtual?table; > QHBox?type_info?node; >@@ -989,13 +989,6 @@ > vtable?for?QHButtonGroup; > typeinfo?for?QHButtonGroup; > non-virtual?thunk?to?QHButtonGroup::*; >- QHGroupBox::*; >- QHGroupBox?virtual?table; >- QHGroupBox?type_info?node; >- QHGroupBox?type_info?function; >- vtable?for?QHGroupBox; >- typeinfo?for?QHGroupBox; >- non-virtual?thunk?to?QHGroupBox::*; > QHeader::*; > QHeader?virtual?table; > QHeader?type_info?node; >@@ -1010,6 +1003,13 @@ > vtable?for?QHebrewCodec; > typeinfo?for?QHebrewCodec; > non-virtual?thunk?to?QHebrewCodec::*; >+ QHGroupBox::*; >+ QHGroupBox?virtual?table; >+ QHGroupBox?type_info?node; >+ QHGroupBox?type_info?function; >+ vtable?for?QHGroupBox; >+ typeinfo?for?QHGroupBox; >+ non-virtual?thunk?to?QHGroupBox::*; > QHideEvent::*; > QHideEvent?virtual?table; > QHideEvent?type_info?node; >@@ -1017,34 +1017,6 @@ > vtable?for?QHideEvent; > typeinfo?for?QHideEvent; > non-virtual?thunk?to?QHideEvent::*; >- QIMComposeEvent::*; >- QIMComposeEvent?virtual?table; >- QIMComposeEvent?type_info?node; >- QIMComposeEvent?type_info?function; >- vtable?for?QIMComposeEvent; >- typeinfo?for?QIMComposeEvent; >- non-virtual?thunk?to?QIMComposeEvent::*; >- QIMEvent::*; >- QIMEvent?virtual?table; >- QIMEvent?type_info?node; >- QIMEvent?type_info?function; >- vtable?for?QIMEvent; >- typeinfo?for?QIMEvent; >- non-virtual?thunk?to?QIMEvent::*; >- QIODevice::*; >- QIODevice?virtual?table; >- QIODevice?type_info?node; >- QIODevice?type_info?function; >- vtable?for?QIODevice; >- typeinfo?for?QIODevice; >- non-virtual?thunk?to?QIODevice::*; >- QIODeviceSource::*; >- QIODeviceSource?virtual?table; >- QIODeviceSource?type_info?node; >- QIODeviceSource?type_info?function; >- vtable?for?QIODeviceSource; >- typeinfo?for?QIODeviceSource; >- non-virtual?thunk?to?QIODeviceSource::*; > QIconDragEvent::*; > QIconDragEvent?virtual?table; > QIconDragEvent?type_info?node; >@@ -1136,6 +1108,20 @@ > vtable?for?QImageTextKeyLang; > typeinfo?for?QImageTextKeyLang; > non-virtual?thunk?to?QImageTextKeyLang::*; >+ QIMComposeEvent::*; >+ QIMComposeEvent?virtual?table; >+ QIMComposeEvent?type_info?node; >+ QIMComposeEvent?type_info?function; >+ vtable?for?QIMComposeEvent; >+ typeinfo?for?QIMComposeEvent; >+ non-virtual?thunk?to?QIMComposeEvent::*; >+ QIMEvent::*; >+ QIMEvent?virtual?table; >+ QIMEvent?type_info?node; >+ QIMEvent?type_info?function; >+ vtable?for?QIMEvent; >+ typeinfo?for?QIMEvent; >+ non-virtual?thunk?to?QIMEvent::*; > QInputDialog::*; > QInputDialog?virtual?table; > QInputDialog?type_info?node; >@@ -1143,13 +1129,6 @@ > vtable?for?QInputDialog; > typeinfo?for?QInputDialog; > non-virtual?thunk?to?QInputDialog::*; >- QIntValidator::*; >- QIntValidator?virtual?table; >- QIntValidator?type_info?node; >- QIntValidator?type_info?function; >- vtable?for?QIntValidator; >- typeinfo?for?QIntValidator; >- non-virtual?thunk?to?QIntValidator::*; > QInternal::*; > QInternal?virtual?table; > QInternal?type_info?node; >@@ -1157,6 +1136,27 @@ > vtable?for?QInternal; > typeinfo?for?QInternal; > non-virtual?thunk?to?QInternal::*; >+ QIntValidator::*; >+ QIntValidator?virtual?table; >+ QIntValidator?type_info?node; >+ QIntValidator?type_info?function; >+ vtable?for?QIntValidator; >+ typeinfo?for?QIntValidator; >+ non-virtual?thunk?to?QIntValidator::*; >+ QIODevice::*; >+ QIODevice?virtual?table; >+ QIODevice?type_info?node; >+ QIODevice?type_info?function; >+ vtable?for?QIODevice; >+ typeinfo?for?QIODevice; >+ non-virtual?thunk?to?QIODevice::*; >+ QIODeviceSource::*; >+ QIODeviceSource?virtual?table; >+ QIODeviceSource?type_info?node; >+ QIODeviceSource?type_info?function; >+ vtable?for?QIODeviceSource; >+ typeinfo?for?QIODeviceSource; >+ non-virtual?thunk?to?QIODeviceSource::*; > QJisCodec::*; > QJisCodec?virtual?table; > QJisCodec?type_info?node; >@@ -1206,20 +1206,6 @@ > vtable?for?QKeySequence; > typeinfo?for?QKeySequence; > non-virtual?thunk?to?QKeySequence::*; >- QLCDNumber::*; >- QLCDNumber?virtual?table; >- QLCDNumber?type_info?node; >- QLCDNumber?type_info?function; >- vtable?for?QLCDNumber; >- typeinfo?for?QLCDNumber; >- non-virtual?thunk?to?QLCDNumber::*; >- QLNode::*; >- QLNode?virtual?table; >- QLNode?type_info?node; >- QLNode?type_info?function; >- vtable?for?QLNode; >- typeinfo?for?QLNode; >- non-virtual?thunk?to?QLNode::*; > QLabel::*; > QLabel?virtual?table; > QLabel?type_info?node; >@@ -1248,6 +1234,13 @@ > vtable?for?QLayoutIterator; > typeinfo?for?QLayoutIterator; > non-virtual?thunk?to?QLayoutIterator::*; >+ QLCDNumber::*; >+ QLCDNumber?virtual?table; >+ QLCDNumber?type_info?node; >+ QLCDNumber?type_info?function; >+ vtable?for?QLCDNumber; >+ typeinfo?for?QLCDNumber; >+ non-virtual?thunk?to?QLCDNumber::*; > QLibrary::*; > QLibrary?virtual?table; > QLibrary?type_info?node; >@@ -1318,13 +1311,13 @@ > vtable?for?QListViewItemIterator; > typeinfo?for?QListViewItemIterator; > non-virtual?thunk?to?QListViewItemIterator::*; >- QLocalFs::*; >- QLocalFs?virtual?table; >- QLocalFs?type_info?node; >- QLocalFs?type_info?function; >- vtable?for?QLocalFs; >- typeinfo?for?QLocalFs; >- non-virtual?thunk?to?QLocalFs::*; >+ QLNode::*; >+ QLNode?virtual?table; >+ QLNode?type_info?node; >+ QLNode?type_info?function; >+ vtable?for?QLNode; >+ typeinfo?for?QLNode; >+ non-virtual?thunk?to?QLNode::*; > QLocale::*; > QLocale?virtual?table; > QLocale?type_info?node; >@@ -1332,13 +1325,13 @@ > vtable?for?QLocale; > typeinfo?for?QLocale; > non-virtual?thunk?to?QLocale::*; >- QMYSQLDriver::*; >- QMYSQLDriver?virtual?table; >- QMYSQLDriver?type_info?node; >- QMYSQLDriver?type_info?function; >- vtable?for?QMYSQLDriver; >- typeinfo?for?QMYSQLDriver; >- non-virtual?thunk?to?QMYSQLDriver::*; >+ QLocalFs::*; >+ QLocalFs?virtual?table; >+ QLocalFs?type_info?node; >+ QLocalFs?type_info?function; >+ vtable?for?QLocalFs; >+ typeinfo?for?QLocalFs; >+ non-virtual?thunk?to?QLocalFs::*; > QMainWindow::*; > QMainWindow?virtual?table; > QMainWindow?type_info?node; >@@ -1500,6 +1493,13 @@ > vtable?for?QMultiLineEdit; > typeinfo?for?QMultiLineEdit; > non-virtual?thunk?to?QMultiLineEdit::*; >+ QMYSQLDriver::*; >+ QMYSQLDriver?virtual?table; >+ QMYSQLDriver?type_info?node; >+ QMYSQLDriver?type_info?function; >+ vtable?for?QMYSQLDriver; >+ typeinfo?for?QMYSQLDriver; >+ non-virtual?thunk?to?QMYSQLDriver::*; > QNetworkOperation::*; > QNetworkOperation?virtual?table; > QNetworkOperation?type_info?node; >@@ -1528,20 +1528,6 @@ > vtable?for?QNumberSection; > typeinfo?for?QNumberSection; > non-virtual?thunk?to?QNumberSection::*; >- QOCIDriver::*; >- QOCIDriver?virtual?table; >- QOCIDriver?type_info?node; >- QOCIDriver?type_info?function; >- vtable?for?QOCIDriver; >- typeinfo?for?QOCIDriver; >- non-virtual?thunk?to?QOCIDriver::*; >- QODBCDriver::*; >- QODBCDriver?virtual?table; >- QODBCDriver?type_info?node; >- QODBCDriver?type_info?function; >- vtable?for?QODBCDriver; >- typeinfo?for?QODBCDriver; >- non-virtual?thunk?to?QODBCDriver::*; > QObject::*; > QObject?virtual?table; > QObject?type_info?node; >@@ -1598,34 +1584,20 @@ > vtable?for?QObjectUserData; > typeinfo?for?QObjectUserData; > non-virtual?thunk?to?QObjectUserData::*; >- QPNGImagePacker::*; >- QPNGImagePacker?virtual?table; >- QPNGImagePacker?type_info?node; >- QPNGImagePacker?type_info?function; >- vtable?for?QPNGImagePacker; >- typeinfo?for?QPNGImagePacker; >- non-virtual?thunk?to?QPNGImagePacker::*; >- QPNGImageWriter::*; >- QPNGImageWriter?virtual?table; >- QPNGImageWriter?type_info?node; >- QPNGImageWriter?type_info?function; >- vtable?for?QPNGImageWriter; >- typeinfo?for?QPNGImageWriter; >- non-virtual?thunk?to?QPNGImageWriter::*; >- QPSPrinter::*; >- QPSPrinter?virtual?table; >- QPSPrinter?type_info?node; >- QPSPrinter?type_info?function; >- vtable?for?QPSPrinter; >- typeinfo?for?QPSPrinter; >- non-virtual?thunk?to?QPSPrinter::*; >- QPSQLDriver::*; >- QPSQLDriver?virtual?table; >- QPSQLDriver?type_info?node; >- QPSQLDriver?type_info?function; >- vtable?for?QPSQLDriver; >- typeinfo?for?QPSQLDriver; >- non-virtual?thunk?to?QPSQLDriver::*; >+ QOCIDriver::*; >+ QOCIDriver?virtual?table; >+ QOCIDriver?type_info?node; >+ QOCIDriver?type_info?function; >+ vtable?for?QOCIDriver; >+ typeinfo?for?QOCIDriver; >+ non-virtual?thunk?to?QOCIDriver::*; >+ QODBCDriver::*; >+ QODBCDriver?virtual?table; >+ QODBCDriver?type_info?node; >+ QODBCDriver?type_info?function; >+ vtable?for?QODBCDriver; >+ typeinfo?for?QODBCDriver; >+ non-virtual?thunk?to?QODBCDriver::*; > QPaintDevice::*; > QPaintDevice?virtual?table; > QPaintDevice?type_info?node; >@@ -1640,13 +1612,6 @@ > vtable?for?QPaintDeviceMetrics; > typeinfo?for?QPaintDeviceMetrics; > non-virtual?thunk?to?QPaintDeviceMetrics::*; >- QPaintEvent::*; >- QPaintEvent?virtual?table; >- QPaintEvent?type_info?node; >- QPaintEvent?type_info?function; >- vtable?for?QPaintEvent; >- typeinfo?for?QPaintEvent; >- non-virtual?thunk?to?QPaintEvent::*; > QPainter::*; > QPainter?virtual?table; > QPainter?type_info?node; >@@ -1654,6 +1619,13 @@ > vtable?for?QPainter; > typeinfo?for?QPainter; > non-virtual?thunk?to?QPainter::*; >+ QPaintEvent::*; >+ QPaintEvent?virtual?table; >+ QPaintEvent?type_info?node; >+ QPaintEvent?type_info?function; >+ vtable?for?QPaintEvent; >+ typeinfo?for?QPaintEvent; >+ non-virtual?thunk?to?QPaintEvent::*; > QPalette::*; > QPalette?virtual?table; > QPalette?type_info?node; >@@ -1696,6 +1668,20 @@ > vtable?for?QPlatinumStyle; > typeinfo?for?QPlatinumStyle; > non-virtual?thunk?to?QPlatinumStyle::*; >+ QPNGImagePacker::*; >+ QPNGImagePacker?virtual?table; >+ QPNGImagePacker?type_info?node; >+ QPNGImagePacker?type_info?function; >+ vtable?for?QPNGImagePacker; >+ typeinfo?for?QPNGImagePacker; >+ non-virtual?thunk?to?QPNGImagePacker::*; >+ QPNGImageWriter::*; >+ QPNGImageWriter?virtual?table; >+ QPNGImageWriter?type_info?node; >+ QPNGImageWriter?type_info?function; >+ vtable?for?QPNGImageWriter; >+ typeinfo?for?QPNGImageWriter; >+ non-virtual?thunk?to?QPNGImageWriter::*; > QPocketPCStyle::*; > QPocketPCStyle?virtual?table; > QPocketPCStyle?type_info?node; >@@ -1780,6 +1766,20 @@ > vtable?for?QProgressDialog; > typeinfo?for?QProgressDialog; > non-virtual?thunk?to?QProgressDialog::*; >+ QPSPrinter::*; >+ QPSPrinter?virtual?table; >+ QPSPrinter?type_info?node; >+ QPSPrinter?type_info?function; >+ vtable?for?QPSPrinter; >+ typeinfo?for?QPSPrinter; >+ non-virtual?thunk?to?QPSPrinter::*; >+ QPSQLDriver::*; >+ QPSQLDriver?virtual?table; >+ QPSQLDriver?type_info?node; >+ QPSQLDriver?type_info?function; >+ vtable?for?QPSQLDriver; >+ typeinfo?for?QPSQLDriver; >+ non-virtual?thunk?to?QPSQLDriver::*; > QPtrCollection::*; > QPtrCollection?virtual?table; > QPtrCollection?type_info?node; >@@ -1843,13 +1843,6 @@ > vtable?for?QResizeEvent; > typeinfo?for?QResizeEvent; > non-virtual?thunk?to?QResizeEvent::*; >- QSGIStyle::*; >- QSGIStyle?virtual?table; >- QSGIStyle?type_info?node; >- QSGIStyle?type_info?function; >- vtable?for?QSGIStyle; >- typeinfo?for?QSGIStyle; >- non-virtual?thunk?to?QSGIStyle::*; > QScrollBar::*; > QScrollBar?virtual?table; > QScrollBar?type_info?node; >@@ -1885,6 +1878,13 @@ > vtable?for?QSettings; > typeinfo?for?QSettings; > non-virtual?thunk?to?QSettings::*; >+ QSGIStyle::*; >+ QSGIStyle?virtual?table; >+ QSGIStyle?type_info?node; >+ QSGIStyle?type_info?function; >+ vtable?for?QSGIStyle; >+ typeinfo?for?QSGIStyle; >+ non-virtual?thunk?to?QSGIStyle::*; > QShared::*; > QShared?virtual?table; > QShared?type_info?node; >@@ -2081,27 +2081,6 @@ > vtable?for?QStrIList; > typeinfo?for?QStrIList; > non-virtual?thunk?to?QStrIList::*; >- QStrIVec::*; >- QStrIVec?virtual?table; >- QStrIVec?type_info?node; >- QStrIVec?type_info?function; >- vtable?for?QStrIVec; >- typeinfo?for?QStrIVec; >- non-virtual?thunk?to?QStrIVec::*; >- QStrList::*; >- QStrList?virtual?table; >- QStrList?type_info?node; >- QStrList?type_info?function; >- vtable?for?QStrList; >- typeinfo?for?QStrList; >- non-virtual?thunk?to?QStrList::*; >- QStrVec::*; >- QStrVec?virtual?table; >- QStrVec?type_info?node; >- QStrVec?type_info?function; >- vtable?for?QStrVec; >- typeinfo?for?QStrVec; >- non-virtual?thunk?to?QStrVec::*; > QString::*; > QString?virtual?table; > QString?type_info?node; >@@ -2123,21 +2102,42 @@ > vtable?for?QStringList; > typeinfo?for?QStringList; > non-virtual?thunk?to?QStringList::*; >- QStyle::*; >- QStyle?virtual?table; >- QStyle?type_info?node; >- QStyle?type_info?function; >- vtable?for?QStyle; >- typeinfo?for?QStyle; >- non-virtual?thunk?to?QStyle::*; >- QStyleFactory::*; >- QStyleFactory?virtual?table; >- QStyleFactory?type_info?node; >- QStyleFactory?type_info?function; >- vtable?for?QStyleFactory; >- typeinfo?for?QStyleFactory; >- non-virtual?thunk?to?QStyleFactory::*; >- QStyleFactoryInterface::*; >+ QStrIVec::*; >+ QStrIVec?virtual?table; >+ QStrIVec?type_info?node; >+ QStrIVec?type_info?function; >+ vtable?for?QStrIVec; >+ typeinfo?for?QStrIVec; >+ non-virtual?thunk?to?QStrIVec::*; >+ QStrList::*; >+ QStrList?virtual?table; >+ QStrList?type_info?node; >+ QStrList?type_info?function; >+ vtable?for?QStrList; >+ typeinfo?for?QStrList; >+ non-virtual?thunk?to?QStrList::*; >+ QStrVec::*; >+ QStrVec?virtual?table; >+ QStrVec?type_info?node; >+ QStrVec?type_info?function; >+ vtable?for?QStrVec; >+ typeinfo?for?QStrVec; >+ non-virtual?thunk?to?QStrVec::*; >+ QStyle::*; >+ QStyle?virtual?table; >+ QStyle?type_info?node; >+ QStyle?type_info?function; >+ vtable?for?QStyle; >+ typeinfo?for?QStyle; >+ non-virtual?thunk?to?QStyle::*; >+ QStyleFactory::*; >+ QStyleFactory?virtual?table; >+ QStyleFactory?type_info?node; >+ QStyleFactory?type_info?function; >+ vtable?for?QStyleFactory; >+ typeinfo?for?QStyleFactory; >+ non-virtual?thunk?to?QStyleFactory::*; >+ QStyleFactoryInterface::*; > QStyleFactoryInterface?virtual?table; > QStyleFactoryInterface?type_info?node; > QStyleFactoryInterface?type_info?function; >@@ -2172,27 +2172,13 @@ > vtable?for?QSyntaxHighlighter; > typeinfo?for?QSyntaxHighlighter; > non-virtual?thunk?to?QSyntaxHighlighter::*; >- QTDSDriver::*; >- QTDSDriver?virtual?table; >- QTDSDriver?type_info?node; >- QTDSDriver?type_info?function; >- vtable?for?QTDSDriver; >- typeinfo?for?QTDSDriver; >- non-virtual?thunk?to?QTDSDriver::*; >- QTLWExtra::*; >- QTLWExtra?virtual?table; >- QTLWExtra?type_info?node; >- QTLWExtra?type_info?function; >- vtable?for?QTLWExtra; >- typeinfo?for?QTLWExtra; >- non-virtual?thunk?to?QTLWExtra::*; >- QTSManip::*; >- QTSManip?virtual?table; >- QTSManip?type_info?node; >- QTSManip?type_info?function; >- vtable?for?QTSManip; >- typeinfo?for?QTSManip; >- non-virtual?thunk?to?QTSManip::*; >+ Qt::*; >+ Qt?virtual?table; >+ Qt?type_info?node; >+ Qt?type_info?function; >+ vtable?for?Qt; >+ typeinfo?for?Qt; >+ non-virtual?thunk?to?Qt::*; > QTab::*; > QTab?virtual?table; > QTab?type_info?node; >@@ -2214,13 +2200,6 @@ > vtable?for?QTabDialog; > typeinfo?for?QTabDialog; > non-virtual?thunk?to?QTabDialog::*; >- QTabWidget::*; >- QTabWidget?virtual?table; >- QTabWidget?type_info?node; >- QTabWidget?type_info?function; >- vtable?for?QTabWidget; >- typeinfo?for?QTabWidget; >- non-virtual?thunk?to?QTabWidget::*; > QTabletEvent::*; > QTabletEvent?virtual?table; > QTabletEvent?type_info?node; >@@ -2228,6 +2207,20 @@ > vtable?for?QTabletEvent; > typeinfo?for?QTabletEvent; > non-virtual?thunk?to?QTabletEvent::*; >+ QTabWidget::*; >+ QTabWidget?virtual?table; >+ QTabWidget?type_info?node; >+ QTabWidget?type_info?function; >+ vtable?for?QTabWidget; >+ typeinfo?for?QTabWidget; >+ non-virtual?thunk?to?QTabWidget::*; >+ QTDSDriver::*; >+ QTDSDriver?virtual?table; >+ QTDSDriver?type_info?node; >+ QTDSDriver?type_info?function; >+ vtable?for?QTDSDriver; >+ typeinfo?for?QTDSDriver; >+ non-virtual?thunk?to?QTDSDriver::*; > QTextBrowser::*; > QTextBrowser?virtual?table; > QTextBrowser?type_info?node; >@@ -2403,13 +2396,6 @@ > vtable?for?QTextHorizontalLine; > typeinfo?for?QTextHorizontalLine; > non-virtual?thunk?to?QTextHorizontalLine::*; >- QTextIStream::*; >- QTextIStream?virtual?table; >- QTextIStream?type_info?node; >- QTextIStream?type_info?function; >- vtable?for?QTextIStream; >- typeinfo?for?QTextIStream; >- non-virtual?thunk?to?QTextIStream::*; > QTextImage::*; > QTextImage?virtual?table; > QTextImage?type_info?node; >@@ -2431,6 +2417,13 @@ > vtable?for?QTextInsertCommand; > typeinfo?for?QTextInsertCommand; > non-virtual?thunk?to?QTextInsertCommand::*; >+ QTextIStream::*; >+ QTextIStream?virtual?table; >+ QTextIStream?type_info?node; >+ QTextIStream?type_info?function; >+ vtable?for?QTextIStream; >+ typeinfo?for?QTextIStream; >+ non-virtual?thunk?to?QTextIStream::*; > QTextItem::*; > QTextItem?virtual?table; > QTextItem?type_info?node; >@@ -2578,6 +2571,13 @@ > vtable?for?QTitleBar; > typeinfo?for?QTitleBar; > non-virtual?thunk?to?QTitleBar::*; >+ QTLWExtra::*; >+ QTLWExtra?virtual?table; >+ QTLWExtra?type_info?node; >+ QTLWExtra?type_info?function; >+ vtable?for?QTLWExtra; >+ typeinfo?for?QTLWExtra; >+ non-virtual?thunk?to?QTLWExtra::*; > QToolBar::*; > QToolBar?virtual?table; > QToolBar?type_info?node; >@@ -2634,6 +2634,20 @@ > vtable?for?QTsciiCodec; > typeinfo?for?QTsciiCodec; > non-virtual?thunk?to?QTsciiCodec::*; >+ QTSManip::*; >+ QTSManip?virtual?table; >+ QTSManip?type_info?node; >+ QTSManip?type_info?function; >+ vtable?for?QTSManip; >+ typeinfo?for?QTSManip; >+ non-virtual?thunk?to?QTSManip::*; >+ QtULong::*; >+ QtULong?virtual?table; >+ QtULong?type_info?node; >+ QtULong?type_info?function; >+ vtable?for?QtULong; >+ typeinfo?for?QtULong; >+ non-virtual?thunk?to?QtULong::*; > QUBuffer::*; > QUBuffer?virtual?table; > QUBuffer?type_info?node; >@@ -2683,6 +2697,13 @@ > vtable?for?QUMethod; > typeinfo?for?QUMethod; > non-virtual?thunk?to?QUMethod::*; >+ QUnknownInterface::*; >+ QUnknownInterface?virtual?table; >+ QUnknownInterface?type_info?node; >+ QUnknownInterface?type_info?function; >+ vtable?for?QUnknownInterface; >+ typeinfo?for?QUnknownInterface; >+ non-virtual?thunk?to?QUnknownInterface::*; > QUObject::*; > QUObject?virtual?table; > QUObject?type_info?node; >@@ -2704,6 +2725,48 @@ > vtable?for?QUProperty; > typeinfo?for?QUProperty; > non-virtual?thunk?to?QUProperty::*; >+ QUriDrag::*; >+ QUriDrag?virtual?table; >+ QUriDrag?type_info?node; >+ QUriDrag?type_info?function; >+ vtable?for?QUriDrag; >+ typeinfo?for?QUriDrag; >+ non-virtual?thunk?to?QUriDrag::*; >+ QUrl::*; >+ QUrl?virtual?table; >+ QUrl?type_info?node; >+ QUrl?type_info?function; >+ vtable?for?QUrl; >+ typeinfo?for?QUrl; >+ non-virtual?thunk?to?QUrl::*; >+ QUrlInfo::*; >+ QUrlInfo?virtual?table; >+ QUrlInfo?type_info?node; >+ QUrlInfo?type_info?function; >+ vtable?for?QUrlInfo; >+ typeinfo?for?QUrlInfo; >+ non-virtual?thunk?to?QUrlInfo::*; >+ QUrlOperator::*; >+ QUrlOperator?virtual?table; >+ QUrlOperator?type_info?node; >+ QUrlOperator?type_info?function; >+ vtable?for?QUrlOperator; >+ typeinfo?for?QUrlOperator; >+ non-virtual?thunk?to?QUrlOperator::*; >+ QUtf16Codec::*; >+ QUtf16Codec?virtual?table; >+ QUtf16Codec?type_info?node; >+ QUtf16Codec?type_info?function; >+ vtable?for?QUtf16Codec; >+ typeinfo?for?QUtf16Codec; >+ non-virtual?thunk?to?QUtf16Codec::*; >+ QUtf8Codec::*; >+ QUtf8Codec?virtual?table; >+ QUtf8Codec?type_info?node; >+ QUtf8Codec?type_info?function; >+ vtable?for?QUtf8Codec; >+ typeinfo?for?QUtf8Codec; >+ non-virtual?thunk?to?QUtf8Codec::*; > QUType::*; > QUType?virtual?table; > QUType?type_info?node; >@@ -2711,27 +2774,6 @@ > vtable?for?QUType; > typeinfo?for?QUType; > non-virtual?thunk?to?QUType::*; >- QUType_Null::*; >- QUType_Null?virtual?table; >- QUType_Null?type_info?node; >- QUType_Null?type_info?function; >- vtable?for?QUType_Null; >- typeinfo?for?QUType_Null; >- non-virtual?thunk?to?QUType_Null::*; >- QUType_QString::*; >- QUType_QString?virtual?table; >- QUType_QString?type_info?node; >- QUType_QString?type_info?function; >- vtable?for?QUType_QString; >- typeinfo?for?QUType_QString; >- non-virtual?thunk?to?QUType_QString::*; >- QUType_QVariant::*; >- QUType_QVariant?virtual?table; >- QUType_QVariant?type_info?node; >- QUType_QVariant?type_info?function; >- vtable?for?QUType_QVariant; >- typeinfo?for?QUType_QVariant; >- non-virtual?thunk?to?QUType_QVariant::*; > QUType_bool::*; > QUType_bool?virtual?table; > QUType_bool?type_info?node; >@@ -2781,6 +2823,13 @@ > vtable?for?QUType_int; > typeinfo?for?QUType_int; > non-virtual?thunk?to?QUType_int::*; >+ QUType_Null::*; >+ QUType_Null?virtual?table; >+ QUType_Null?type_info?node; >+ QUType_Null?type_info?function; >+ vtable?for?QUType_Null; >+ typeinfo?for?QUType_Null; >+ non-virtual?thunk?to?QUType_Null::*; > QUType_ptr::*; > QUType_ptr?virtual?table; > QUType_ptr?type_info?node; >@@ -2788,6 +2837,20 @@ > vtable?for?QUType_ptr; > typeinfo?for?QUType_ptr; > non-virtual?thunk?to?QUType_ptr::*; >+ QUType_QString::*; >+ QUType_QString?virtual?table; >+ QUType_QString?type_info?node; >+ QUType_QString?type_info?function; >+ vtable?for?QUType_QString; >+ typeinfo?for?QUType_QString; >+ non-virtual?thunk?to?QUType_QString::*; >+ QUType_QVariant::*; >+ QUType_QVariant?virtual?table; >+ QUType_QVariant?type_info?node; >+ QUType_QVariant?type_info?function; >+ vtable?for?QUType_QVariant; >+ typeinfo?for?QUType_QVariant; >+ non-virtual?thunk?to?QUType_QVariant::*; > QUType_varptr::*; > QUType_varptr?virtual?table; > QUType_varptr?type_info?node; >@@ -2795,55 +2858,6 @@ > vtable?for?QUType_varptr; > typeinfo?for?QUType_varptr; > non-virtual?thunk?to?QUType_varptr::*; >- QUnknownInterface::*; >- QUnknownInterface?virtual?table; >- QUnknownInterface?type_info?node; >- QUnknownInterface?type_info?function; >- vtable?for?QUnknownInterface; >- typeinfo?for?QUnknownInterface; >- non-virtual?thunk?to?QUnknownInterface::*; >- QUriDrag::*; >- QUriDrag?virtual?table; >- QUriDrag?type_info?node; >- QUriDrag?type_info?function; >- vtable?for?QUriDrag; >- typeinfo?for?QUriDrag; >- non-virtual?thunk?to?QUriDrag::*; >- QUrl::*; >- QUrl?virtual?table; >- QUrl?type_info?node; >- QUrl?type_info?function; >- vtable?for?QUrl; >- typeinfo?for?QUrl; >- non-virtual?thunk?to?QUrl::*; >- QUrlInfo::*; >- QUrlInfo?virtual?table; >- QUrlInfo?type_info?node; >- QUrlInfo?type_info?function; >- vtable?for?QUrlInfo; >- typeinfo?for?QUrlInfo; >- non-virtual?thunk?to?QUrlInfo::*; >- QUrlOperator::*; >- QUrlOperator?virtual?table; >- QUrlOperator?type_info?node; >- QUrlOperator?type_info?function; >- vtable?for?QUrlOperator; >- typeinfo?for?QUrlOperator; >- non-virtual?thunk?to?QUrlOperator::*; >- QUtf16Codec::*; >- QUtf16Codec?virtual?table; >- QUtf16Codec?type_info?node; >- QUtf16Codec?type_info?function; >- vtable?for?QUtf16Codec; >- typeinfo?for?QUtf16Codec; >- non-virtual?thunk?to?QUtf16Codec::*; >- QUtf8Codec::*; >- QUtf8Codec?virtual?table; >- QUtf8Codec?type_info?node; >- QUtf8Codec?type_info?function; >- vtable?for?QUtf8Codec; >- typeinfo?for?QUtf8Codec; >- non-virtual?thunk?to?QUtf8Codec::*; > QUuid::*; > QUuid?virtual?table; > QUuid?type_info?node; >@@ -2851,6 +2865,20 @@ > vtable?for?QUuid; > typeinfo?for?QUuid; > non-virtual?thunk?to?QUuid::*; >+ QValidator::*; >+ QValidator?virtual?table; >+ QValidator?type_info?node; >+ QValidator?type_info?function; >+ vtable?for?QValidator; >+ typeinfo?for?QValidator; >+ non-virtual?thunk?to?QValidator::*; >+ QVariant::*; >+ QVariant?virtual?table; >+ QVariant?type_info?node; >+ QVariant?type_info?function; >+ vtable?for?QVariant; >+ typeinfo?for?QVariant; >+ non-virtual?thunk?to?QVariant::*; > QVBox::*; > QVBox?virtual?table; > QVBox?type_info?node; >@@ -2879,20 +2907,6 @@ > vtable?for?QVGroupBox; > typeinfo?for?QVGroupBox; > non-virtual?thunk?to?QVGroupBox::*; >- QValidator::*; >- QValidator?virtual?table; >- QValidator?type_info?node; >- QValidator?type_info?function; >- vtable?for?QValidator; >- typeinfo?for?QValidator; >- non-virtual?thunk?to?QValidator::*; >- QVariant::*; >- QVariant?virtual?table; >- QVariant?type_info?node; >- QVariant?type_info?function; >- vtable?for?QVariant; >- typeinfo?for?QVariant; >- non-virtual?thunk?to?QVariant::*; > QWExtra::*; > QWExtra?virtual?table; > QWExtra?type_info?node; >@@ -2900,13 +2914,6 @@ > vtable?for?QWExtra; > typeinfo?for?QWExtra; > non-virtual?thunk?to?QWExtra::*; >- QWMatrix::*; >- QWMatrix?virtual?table; >- QWMatrix?type_info?node; >- QWMatrix?type_info?function; >- vtable?for?QWMatrix; >- typeinfo?for?QWMatrix; >- non-virtual?thunk?to?QWMatrix::*; > QWhatsThis::*; > QWhatsThis?virtual?table; > QWhatsThis?type_info?node; >@@ -3005,20 +3012,13 @@ > vtable?for?QWizard; > typeinfo?for?QWizard; > non-virtual?thunk?to?QWizard::*; >- Qt::*; >- Qt?virtual?table; >- Qt?type_info?node; >- Qt?type_info?function; >- vtable?for?Qt; >- typeinfo?for?Qt; >- non-virtual?thunk?to?Qt::*; >- QtULong::*; >- QtULong?virtual?table; >- QtULong?type_info?node; >- QtULong?type_info?function; >- vtable?for?QtULong; >- typeinfo?for?QtULong; >- non-virtual?thunk?to?QtULong::*; >+ QWMatrix::*; >+ QWMatrix?virtual?table; >+ QWMatrix?type_info?node; >+ QWMatrix?type_info?function; >+ vtable?for?QWMatrix; >+ typeinfo?for?QWMatrix; >+ non-virtual?thunk?to?QWMatrix::*; > UndoRedoInfo::*; > UndoRedoInfo?virtual?table; > UndoRedoInfo?type_info?node; >diff -ruN qt-x11-commercial-3.3.8/src/moc/moc_lex.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/moc/moc_lex.cpp >--- qt-x11-commercial-3.3.8/src/moc/moc_lex.cpp 2007-03-23 10:21:29.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/moc/moc_lex.cpp 2007-03-23 10:21:13.000000000 -0400 >@@ -1,85 +1,32 @@ >- >-#line 3 "lex.yy.c" >- >-#define YY_INT_ALIGNED short int >- > /* A lexical scanner generated by flex */ > >+/* Scanner skeleton version: >+ * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ >+ */ >+ > #define FLEX_SCANNER > #define YY_FLEX_MAJOR_VERSION 2 > #define YY_FLEX_MINOR_VERSION 5 >-#define YY_FLEX_SUBMINOR_VERSION 31 >-#if YY_FLEX_SUBMINOR_VERSION > 0 >-#define FLEX_BETA >-#endif > >-/* First, we deal with platform-specific or compiler-specific issues. */ >- >-/* begin standard C headers. */ > #include <stdio.h> >-#include <string.h> >-#include <errno.h> >-#include <stdlib.h> >- >-/* end standard C headers. */ >- >-/* flex integer type definitions */ >- >-#ifndef FLEXINT_H >-#define FLEXINT_H >- >-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ >+#include <unistd.h> > >-#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L >-#include <inttypes.h> >-typedef int8_t flex_int8_t; >-typedef uint8_t flex_uint8_t; >-typedef int16_t flex_int16_t; >-typedef uint16_t flex_uint16_t; >-typedef int32_t flex_int32_t; >-typedef uint32_t flex_uint32_t; >-#else >-typedef signed char flex_int8_t; >-typedef short int flex_int16_t; >-typedef int flex_int32_t; >-typedef unsigned char flex_uint8_t; >-typedef unsigned short int flex_uint16_t; >-typedef unsigned int flex_uint32_t; >-#endif /* ! C99 */ > >-/* Limits of integral types. */ >-#ifndef INT8_MIN >-#define INT8_MIN (-128) >-#endif >-#ifndef INT16_MIN >-#define INT16_MIN (-32767-1) >-#endif >-#ifndef INT32_MIN >-#define INT32_MIN (-2147483647-1) >-#endif >-#ifndef INT8_MAX >-#define INT8_MAX (127) >-#endif >-#ifndef INT16_MAX >-#define INT16_MAX (32767) >-#endif >-#ifndef INT32_MAX >-#define INT32_MAX (2147483647) >-#endif >-#ifndef UINT8_MAX >-#define UINT8_MAX (255U) >-#endif >-#ifndef UINT16_MAX >-#define UINT16_MAX (65535U) >+/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ >+#ifdef c_plusplus >+#ifndef __cplusplus >+#define __cplusplus > #endif >-#ifndef UINT32_MAX >-#define UINT32_MAX (4294967295U) > #endif > >-#endif /* ! FLEXINT_H */ > > #ifdef __cplusplus > >+#include <stdlib.h> >+ >+/* Use prototypes in function declarations. */ >+#define YY_USE_PROTOS >+ > /* The "const" storage-class-modifier is valid. */ > #define YY_USE_CONST > >@@ -87,17 +34,34 @@ > > #if __STDC__ > >+#define YY_USE_PROTOS > #define YY_USE_CONST > > #endif /* __STDC__ */ > #endif /* ! __cplusplus */ > >+#ifdef __TURBOC__ >+ #pragma warn -rch >+ #pragma warn -use >+#include <io.h> >+#include <stdlib.h> >+#define YY_USE_CONST >+#define YY_USE_PROTOS >+#endif >+ > #ifdef YY_USE_CONST > #define yyconst const > #else > #define yyconst > #endif > >+ >+#ifdef YY_USE_PROTOS >+#define YY_PROTO(proto) proto >+#else >+#define YY_PROTO(proto) () >+#endif >+ > /* Returned upon end-of-file. */ > #define YY_NULL 0 > >@@ -112,71 +76,71 @@ > * but we do it the disgusting crufty way forced on us by the ()-less > * definition of BEGIN. > */ >-#define BEGIN (yy_start) = 1 + 2 * >+#define BEGIN yy_start = 1 + 2 * > > /* Translate the current start state into a value that can be later handed > * to BEGIN to return to the state. The YYSTATE alias is for lex > * compatibility. > */ >-#define YY_START (((yy_start) - 1) / 2) >+#define YY_START ((yy_start - 1) / 2) > #define YYSTATE YY_START > > /* Action number for EOF rule of a given start state. */ > #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) > > /* Special action meaning "start processing a new file". */ >-#define YY_NEW_FILE yyrestart(yyin ) >+#define YY_NEW_FILE yyrestart( yyin ) > > #define YY_END_OF_BUFFER_CHAR 0 > > /* Size of default input buffer. */ >-#ifndef YY_BUF_SIZE > #define YY_BUF_SIZE 16384 >-#endif > >-#ifndef YY_TYPEDEF_YY_BUFFER_STATE >-#define YY_TYPEDEF_YY_BUFFER_STATE > typedef struct yy_buffer_state *YY_BUFFER_STATE; >-#endif > > extern int yyleng; >- > extern FILE *yyin, *yyout; > > #define EOB_ACT_CONTINUE_SCAN 0 > #define EOB_ACT_END_OF_FILE 1 > #define EOB_ACT_LAST_MATCH 2 > >- #define YY_LESS_LINENO(n) >- >-/* Return all but the first "n" matched characters back to the input stream. */ >+/* The funky do-while in the following #define is used to turn the definition >+ * int a single C statement (which needs a semi-colon terminator). This >+ * avoids problems with code like: >+ * >+ * if ( condition_holds ) >+ * yyless( 5 ); >+ * else >+ * do_something_else(); >+ * >+ * Prior to using the do-while the compiler would get upset at the >+ * "else" because it interpreted the "if" statement as being all >+ * done when it reached the ';' after the yyless() call. >+ */ >+ >+/* Return all but the first 'n' matched characters back to the input stream. */ >+ > #define yyless(n) \ > do \ > { \ > /* Undo effects of setting up yytext. */ \ >- int yyless_macro_arg = (n); \ >- YY_LESS_LINENO(yyless_macro_arg);\ >- *yy_cp = (yy_hold_char); \ >+ *yy_cp = yy_hold_char; \ > YY_RESTORE_YY_MORE_OFFSET \ >- (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ >+ yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ > YY_DO_BEFORE_ACTION; /* set up yytext again */ \ > } \ > while ( 0 ) > >-#define unput(c) yyunput( c, (yytext_ptr) ) >+#define unput(c) yyunput( c, yytext_ptr ) > > /* The following is because we cannot portably get our hands on size_t > * (without autoconf's help, which isn't available because we want > * flex-generated scanners to compile on their own). > */ >- >-#ifndef YY_TYPEDEF_YY_SIZE_T >-#define YY_TYPEDEF_YY_SIZE_T > typedef unsigned int yy_size_t; >-#endif > >-#ifndef YY_STRUCT_YY_BUFFER_STATE >-#define YY_STRUCT_YY_BUFFER_STATE >+ > struct yy_buffer_state > { > FILE *yy_input_file; >@@ -213,16 +177,12 @@ > */ > int yy_at_bol; > >- int yy_bs_lineno; /**< The line count. */ >- int yy_bs_column; /**< The column count. */ >- > /* Whether to try to fill the input buffer when we reach the > * end of it. > */ > int yy_fill_buffer; > > int yy_buffer_status; >- > #define YY_BUFFER_NEW 0 > #define YY_BUFFER_NORMAL 1 > /* When an EOF's been seen but there's still some text to process >@@ -236,33 +196,23 @@ > * just pointing yyin at a new input file. > */ > #define YY_BUFFER_EOF_PENDING 2 >- > }; >-#endif /* !YY_STRUCT_YY_BUFFER_STATE */ > >-/* Stack of input buffers. */ >-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ >-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ >-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ >+static YY_BUFFER_STATE yy_current_buffer = 0; > > /* We provide macros for accessing buffer states in case in the > * future we want to put the buffer states in a more general > * "scanner state". >- * >- * Returns the top of the stack, or NULL. > */ >-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ >- ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ >- : NULL) >+#define YY_CURRENT_BUFFER yy_current_buffer > >-/* Same as previous macro, but useful when we know that the buffer stack is not >- * NULL or when we need an lvalue. For internal use only. >- */ >-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] > > /* yy_hold_char holds the character lost when yytext is formed. */ > static char yy_hold_char; >+ > static int yy_n_chars; /* number of characters read into yy_ch_buf */ >+ >+ > int yyleng; > > /* Points to current character in buffer. */ >@@ -275,92 +225,66 @@ > */ > static int yy_did_buffer_switch_on_eof; > >-void yyrestart (FILE *input_file ); >-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); >-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size ); >-void yy_delete_buffer (YY_BUFFER_STATE b ); >-void yy_flush_buffer (YY_BUFFER_STATE b ); >-void yypush_buffer_state (YY_BUFFER_STATE new_buffer ); >-void yypop_buffer_state (void ); >- >-static void yyensure_buffer_stack (void ); >-static void yy_load_buffer_state (void ); >-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); >- >-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER ) >- >-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); >-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); >-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); >- >-void *yyalloc (yy_size_t ); >-void *yyrealloc (void *,yy_size_t ); >-void yyfree (void * ); >+void yyrestart YY_PROTO(( FILE *input_file )); >+ >+void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); >+void yy_load_buffer_state YY_PROTO(( void )); >+YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); >+void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); >+void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); >+void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); >+#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) >+ >+YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); >+YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); >+YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); >+ >+static void *yy_flex_alloc YY_PROTO(( yy_size_t )); >+static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); >+static void yy_flex_free YY_PROTO(( void * )); > > #define yy_new_buffer yy_create_buffer > > #define yy_set_interactive(is_interactive) \ > { \ >- if ( ! YY_CURRENT_BUFFER ){ \ >- yyensure_buffer_stack (); \ >- YY_CURRENT_BUFFER_LVALUE = \ >- yy_create_buffer(yyin,YY_BUF_SIZE ); \ >- } \ >- YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ >+ if ( ! yy_current_buffer ) \ >+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ >+ yy_current_buffer->yy_is_interactive = is_interactive; \ > } > > #define yy_set_bol(at_bol) \ > { \ >- if ( ! YY_CURRENT_BUFFER ){\ >- yyensure_buffer_stack (); \ >- YY_CURRENT_BUFFER_LVALUE = \ >- yy_create_buffer(yyin,YY_BUF_SIZE ); \ >- } \ >- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ >+ if ( ! yy_current_buffer ) \ >+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ >+ yy_current_buffer->yy_at_bol = at_bol; \ > } > >-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) >- >-/* Begin user sect3 */ >+#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) > > typedef unsigned char YY_CHAR; >- > FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; >- > typedef int yy_state_type; >- >-extern int yylineno; >- >-int yylineno = 1; >- > extern char *yytext; > #define yytext_ptr yytext > >-static yy_state_type yy_get_previous_state (void ); >-static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); >-static int yy_get_next_buffer (void ); >-static void yy_fatal_error (yyconst char msg[] ); >+static yy_state_type yy_get_previous_state YY_PROTO(( void )); >+static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); >+static int yy_get_next_buffer YY_PROTO(( void )); >+static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); > > /* Done after the current pattern has been matched and before the > * corresponding action - sets up yytext. > */ > #define YY_DO_BEFORE_ACTION \ >- (yytext_ptr) = yy_bp; \ >- yyleng = (size_t) (yy_cp - yy_bp); \ >- (yy_hold_char) = *yy_cp; \ >+ yytext_ptr = yy_bp; \ >+ yyleng = (int) (yy_cp - yy_bp); \ >+ yy_hold_char = *yy_cp; \ > *yy_cp = '\0'; \ >- (yy_c_buf_p) = yy_cp; >+ yy_c_buf_p = yy_cp; > > #define YY_NUM_RULES 151 > #define YY_END_OF_BUFFER 152 >-/* This struct is not used in this scanner, >- but its presence is necessary. */ >-struct yy_trans_info >- { >- flex_int32_t yy_verify; >- flex_int32_t yy_nxt; >- }; >-static yyconst flex_int16_t yy_accept[615] = >+static yyconst short int yy_accept[615] = > { 0, > 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, >@@ -432,7 +356,7 @@ > 41, 8, 22, 0 > } ; > >-static yyconst flex_int32_t yy_ec[256] = >+static yyconst int yy_ec[256] = > { 0, > 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, > 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, >@@ -464,7 +388,7 @@ > 1, 1, 1, 1, 1 > } ; > >-static yyconst flex_int32_t yy_meta[72] = >+static yyconst int yy_meta[72] = > { 0, > 1, 1, 1, 2, 3, 1, 4, 1, 1, 1, > 1, 1, 1, 5, 5, 5, 1, 1, 1, 1, >@@ -476,7 +400,7 @@ > 1 > } ; > >-static yyconst flex_int16_t yy_base[642] = >+static yyconst short int yy_base[642] = > { 0, > 0, 3, 16, 5, 87, 9, 158, 229, 300, 176, > 370, 440, 207, 510, 382, 555, 184, 399, 600, 645, >@@ -551,7 +475,7 @@ > 958 > } ; > >-static yyconst flex_int16_t yy_def[642] = >+static yyconst short int yy_def[642] = > { 0, > 615, 615, 614, 3, 614, 5, 616, 616, 614, 9, > 617, 617, 618, 618, 619, 619, 620, 620, 621, 621, >@@ -626,7 +550,7 @@ > 614 > } ; > >-static yyconst flex_int16_t yy_nxt[1262] = >+static yyconst short int yy_nxt[1262] = > { 0, > 614, 31, 31, 32, 31, 34, 32, 45, 35, 614, > 46, 74, 33, 614, 75, 33, 36, 37, 37, 32, >@@ -769,7 +693,7 @@ > 614 > } ; > >-static yyconst flex_int16_t yy_chk[1262] = >+static yyconst short int yy_chk[1262] = > { 0, > 0, 1, 1, 1, 2, 2, 2, 4, 2, 0, > 4, 6, 1, 0, 6, 2, 3, 3, 3, 3, >@@ -915,9 +839,6 @@ > static yy_state_type yy_last_accepting_state; > static char *yy_last_accepting_cpos; > >-extern int yy_flex_debug; >-int yy_flex_debug = 0; >- > /* The intent behind this definition is that it'll catch > * any uses of REJECT which flex missed. > */ >@@ -927,8 +848,9 @@ > #define YY_RESTORE_YY_MORE_OFFSET > char *yytext; > #line 1 "moc.l" >+#define INITIAL 0 > /**************************************************************************** >-** $Id: qt/moc_lex.cpp 3.3.8 edited Feb 2 14:59 $ >+** $Id: qt/moc_lex.cpp 3.3.8 edited Mar 23 02:24 $ > ** > ** Lexical analyzer for meta object compiler > ** >@@ -1028,10 +950,6 @@ > extern void addExpressionChar( const char ); > extern void addExpressionString( const char * ); > extern void moc_warn( const char *msg ); >- >-#line 1033 "lex.yy.c" >- >-#define INITIAL 0 > #define OUTSIDE 1 > #define QT_DEF 2 > #define IN_CLASS 3 >@@ -1046,17 +964,7 @@ > #define IN_PROPERTY 12 > #define IN_CLASSINFO 13 > >-#ifndef YY_NO_UNISTD_H >-/* Special case for "unistd.h", since it is non-ANSI. We include it way >- * down here because we want the user's section 1 to have been scanned first. >- * The user has a chance to override it with an option. >- */ >-#include <unistd.h> >-#endif >- >-#ifndef YY_EXTRA_TYPE >-#define YY_EXTRA_TYPE void * >-#endif >+#line 968 "lex.yy.c" > > /* Macros after this point can all be overridden by user definitions in > * section 1. >@@ -1064,30 +972,65 @@ > > #ifndef YY_SKIP_YYWRAP > #ifdef __cplusplus >-extern "C" int yywrap (void ); >+extern "C" int yywrap YY_PROTO(( void )); > #else >-extern int yywrap (void ); >+extern int yywrap YY_PROTO(( void )); >+#endif > #endif >+ >+#ifndef YY_NO_UNPUT >+static void yyunput YY_PROTO(( int c, char *buf_ptr )); > #endif > >- static void yyunput (int c,char *buf_ptr ); >- > #ifndef yytext_ptr >-static void yy_flex_strncpy (char *,yyconst char *,int ); >+static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); > #endif > > #ifdef YY_NEED_STRLEN >-static int yy_flex_strlen (yyconst char * ); >+static int yy_flex_strlen YY_PROTO(( yyconst char * )); > #endif > > #ifndef YY_NO_INPUT >- > #ifdef __cplusplus >-static int yyinput (void ); >+static int yyinput YY_PROTO(( void )); > #else >-static int input (void ); >+static int input YY_PROTO(( void )); >+#endif > #endif > >+#if YY_STACK_USED >+static int yy_start_stack_ptr = 0; >+static int yy_start_stack_depth = 0; >+static int *yy_start_stack = 0; >+#ifndef YY_NO_PUSH_STATE >+static void yy_push_state YY_PROTO(( int new_state )); >+#endif >+#ifndef YY_NO_POP_STATE >+static void yy_pop_state YY_PROTO(( void )); >+#endif >+#ifndef YY_NO_TOP_STATE >+static int yy_top_state YY_PROTO(( void )); >+#endif >+ >+#else >+#define YY_NO_PUSH_STATE 1 >+#define YY_NO_POP_STATE 1 >+#define YY_NO_TOP_STATE 1 >+#endif >+ >+#ifdef YY_MALLOC_DECL >+YY_MALLOC_DECL >+#else >+#if __STDC__ >+#ifndef __cplusplus >+#include <stdlib.h> >+#endif >+#else >+/* Just try to get by without declaring the routines. This will fail >+ * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) >+ * or sizeof(void*) != sizeof(int). >+ */ >+#endif > #endif > > /* Amount of stuff to slurp up with each read. */ >@@ -1096,6 +1039,7 @@ > #endif > > /* Copy whatever the last rule matched to the standard output. */ >+ > #ifndef ECHO > /* This used to be an fputs(), but since the string might contain NUL's, > * we now use fwrite(). >@@ -1108,10 +1052,9 @@ > */ > #ifndef YY_INPUT > #define YY_INPUT(buf,result,max_size) \ >- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ >+ if ( yy_current_buffer->yy_is_interactive ) \ > { \ >- int c = '*'; \ >- size_t n; \ >+ int c = '*', n; \ > for ( n = 0; n < max_size && \ > (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ > buf[n] = (char) c; \ >@@ -1121,22 +1064,9 @@ > YY_FATAL_ERROR( "input in flex scanner failed" ); \ > result = n; \ > } \ >- else \ >- { \ >- errno=0; \ >- while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ >- { \ >- if( errno != EINTR) \ >- { \ >- YY_FATAL_ERROR( "input in flex scanner failed" ); \ >- break; \ >- } \ >- errno=0; \ >- clearerr(yyin); \ >- } \ >- }\ >-\ >- >+ else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ >+ && ferror( yyin ) ) \ >+ YY_FATAL_ERROR( "input in flex scanner failed" ); > #endif > > /* No semi-colon after return; correct usage is to write "yyterminate();" - >@@ -1157,18 +1087,12 @@ > #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) > #endif > >-/* end tables serialization structures and prototypes */ >- > /* Default declaration of generated scanner - a define so the user can > * easily add parameters. > */ > #ifndef YY_DECL >-#define YY_DECL_IS_OURS 1 >- >-extern int yylex (void); >- >-#define YY_DECL int yylex (void) >-#endif /* !YY_DECL */ >+#define YY_DECL int yylex YY_PROTO(( void )) >+#endif > > /* Code executed at the beginning of each rule, after yytext and yyleng > * have been set up. >@@ -1184,33 +1108,31 @@ > > #define YY_RULE_SETUP \ > if ( yyleng > 0 ) \ >- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \ >+ yy_current_buffer->yy_at_bol = \ > (yytext[yyleng - 1] == '\n'); \ > YY_USER_ACTION > >-/** The main scanner function which does all the work. >- */ > YY_DECL >-{ >+ { > register yy_state_type yy_current_state; >- register char *yy_cp, *yy_bp; >+ register char *yy_cp = NULL, *yy_bp = NULL; > register int yy_act; >- >+ > #line 110 "moc.l" > > >-#line 1203 "lex.yy.c" >+#line 1125 "lex.yy.c" > >- if ( (yy_init) ) >+ if ( yy_init ) > { >- (yy_init) = 0; >+ yy_init = 0; > > #ifdef YY_USER_INIT > YY_USER_INIT; > #endif > >- if ( ! (yy_start) ) >- (yy_start) = 1; /* first start state */ >+ if ( ! yy_start ) >+ yy_start = 1; /* first start state */ > > if ( ! yyin ) > yyin = stdin; >@@ -1218,28 +1140,26 @@ > if ( ! yyout ) > yyout = stdout; > >- if ( ! YY_CURRENT_BUFFER ) { >- yyensure_buffer_stack (); >- YY_CURRENT_BUFFER_LVALUE = >- yy_create_buffer(yyin,YY_BUF_SIZE ); >- } >+ if ( ! yy_current_buffer ) >+ yy_current_buffer = >+ yy_create_buffer( yyin, YY_BUF_SIZE ); > >- yy_load_buffer_state( ); >+ yy_load_buffer_state(); > } > > while ( 1 ) /* loops until end-of-file is reached */ > { >- yy_cp = (yy_c_buf_p); >+ yy_cp = yy_c_buf_p; > > /* Support of yytext. */ >- *yy_cp = (yy_hold_char); >+ *yy_cp = yy_hold_char; > > /* yy_bp points to the position in yy_ch_buf of the start of > * the current run. > */ > yy_bp = yy_cp; > >- yy_current_state = (yy_start); >+ yy_current_state = yy_start; > yy_current_state += YY_AT_BOL(); > yy_match: > do >@@ -1247,8 +1167,8 @@ > register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; > if ( yy_accept[yy_current_state] ) > { >- (yy_last_accepting_state) = yy_current_state; >- (yy_last_accepting_cpos) = yy_cp; >+ yy_last_accepting_state = yy_current_state; >+ yy_last_accepting_cpos = yy_cp; > } > while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) > { >@@ -1265,22 +1185,24 @@ > yy_act = yy_accept[yy_current_state]; > if ( yy_act == 0 ) > { /* have to back up */ >- yy_cp = (yy_last_accepting_cpos); >- yy_current_state = (yy_last_accepting_state); >+ yy_cp = yy_last_accepting_cpos; >+ yy_current_state = yy_last_accepting_state; > yy_act = yy_accept[yy_current_state]; > } > > YY_DO_BEFORE_ACTION; > >+ > do_action: /* This label is used only to access EOF actions. */ > >+ > switch ( yy_act ) > { /* beginning of action switch */ > case 0: /* must back up */ > /* undo the effects of YY_DO_BEFORE_ACTION */ >- *yy_cp = (yy_hold_char); >- yy_cp = (yy_last_accepting_cpos); >- yy_current_state = (yy_last_accepting_state); >+ *yy_cp = yy_hold_char; >+ yy_cp = yy_last_accepting_cpos; >+ yy_current_state = yy_last_accepting_state; > goto yy_find_action; > > case 1: >@@ -1853,7 +1775,6 @@ > { X; return ','; } > YY_BREAK > case 104: >-/* rule 104 can match eol */ > YY_RULE_SETUP > #line 278 "moc.l" > { >@@ -1879,7 +1800,6 @@ > ; > YY_BREAK > case 108: >-/* rule 108 can match eol */ > YY_RULE_SETUP > #line 289 "moc.l" > { /* discard strings */ >@@ -1887,7 +1807,6 @@ > } > YY_BREAK > case 109: >-/* rule 109 can match eol */ > YY_RULE_SETUP > #line 293 "moc.l" > { /* discard strings */ >@@ -1895,7 +1814,6 @@ > } > YY_BREAK > case 110: >-/* rule 110 can match eol */ > YY_RULE_SETUP > #line 297 "moc.l" > { /* discard strings */ >@@ -1903,7 +1821,6 @@ > } > YY_BREAK > case 111: >-/* rule 111 can match eol */ > YY_RULE_SETUP > #line 301 "moc.l" > { /* discard strings */ >@@ -1913,7 +1830,6 @@ > } > YY_BREAK > case 112: >-/* rule 112 can match eol */ > YY_RULE_SETUP > #line 308 "moc.l" > { >@@ -1924,7 +1840,6 @@ > } > YY_BREAK > case 113: >-/* rule 113 can match eol */ > YY_RULE_SETUP > #line 315 "moc.l" > { >@@ -2089,8 +2004,8 @@ > } > YY_BREAK > case 133: >-*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */ >-(yy_c_buf_p) = yy_cp -= 1; >+*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ >+yy_c_buf_p = yy_cp -= 1; > YY_DO_BEFORE_ACTION; /* set up yytext again */ > YY_RULE_SETUP > #line 420 "moc.l" >@@ -2225,7 +2140,6 @@ > } > YY_BREAK > case 150: >-/* rule 150 can match eol */ > YY_RULE_SETUP > #line 488 "moc.l" > { >@@ -2237,7 +2151,7 @@ > #line 493 "moc.l" > ECHO; > YY_BREAK >-#line 2241 "lex.yy.c" >+#line 2155 "lex.yy.c" > case YY_STATE_EOF(INITIAL): > case YY_STATE_EOF(OUTSIDE): > case YY_STATE_EOF(QT_DEF): >@@ -2257,26 +2171,26 @@ > case YY_END_OF_BUFFER: > { > /* Amount of text matched not including the EOB char. */ >- int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; >+ int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; > > /* Undo the effects of YY_DO_BEFORE_ACTION. */ >- *yy_cp = (yy_hold_char); >+ *yy_cp = yy_hold_char; > YY_RESTORE_YY_MORE_OFFSET > >- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) >+ if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) > { > /* We're scanning a new file or input source. It's > * possible that this happened because the user > * just pointed yyin at a new source and called > * yylex(). If so, then we have to assure >- * consistency between YY_CURRENT_BUFFER and our >+ * consistency between yy_current_buffer and our > * globals. Here is the right place to do so, because > * this is the first action (other than possibly a > * back-up) that will match for the new input source. > */ >- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; >- YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; >- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; >+ yy_n_chars = yy_current_buffer->yy_n_chars; >+ yy_current_buffer->yy_input_file = yyin; >+ yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; > } > > /* Note that here we test for yy_c_buf_p "<=" to the position >@@ -2286,13 +2200,13 @@ > * end-of-buffer state). Contrast this with the test > * in input(). > */ >- if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) >+ if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) > { /* This was really a NUL. */ > yy_state_type yy_next_state; > >- (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; >+ yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; > >- yy_current_state = yy_get_previous_state( ); >+ yy_current_state = yy_get_previous_state(); > > /* Okay, we're now positioned to make the NUL > * transition. We couldn't have >@@ -2305,30 +2219,30 @@ > > yy_next_state = yy_try_NUL_trans( yy_current_state ); > >- yy_bp = (yytext_ptr) + YY_MORE_ADJ; >+ yy_bp = yytext_ptr + YY_MORE_ADJ; > > if ( yy_next_state ) > { > /* Consume the NUL. */ >- yy_cp = ++(yy_c_buf_p); >+ yy_cp = ++yy_c_buf_p; > yy_current_state = yy_next_state; > goto yy_match; > } > > else > { >- yy_cp = (yy_c_buf_p); >+ yy_cp = yy_c_buf_p; > goto yy_find_action; > } > } > >- else switch ( yy_get_next_buffer( ) ) >+ else switch ( yy_get_next_buffer() ) > { > case EOB_ACT_END_OF_FILE: > { >- (yy_did_buffer_switch_on_eof) = 0; >+ yy_did_buffer_switch_on_eof = 0; > >- if ( yywrap( ) ) >+ if ( yywrap() ) > { > /* Note: because we've taken care in > * yy_get_next_buffer() to have set up >@@ -2339,7 +2253,7 @@ > * YY_NULL, it'll still work - another > * YY_NULL will get returned. > */ >- (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; >+ yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; > > yy_act = YY_STATE_EOF(YY_START); > goto do_action; >@@ -2347,30 +2261,30 @@ > > else > { >- if ( ! (yy_did_buffer_switch_on_eof) ) >+ if ( ! yy_did_buffer_switch_on_eof ) > YY_NEW_FILE; > } > break; > } > > case EOB_ACT_CONTINUE_SCAN: >- (yy_c_buf_p) = >- (yytext_ptr) + yy_amount_of_matched_text; >+ yy_c_buf_p = >+ yytext_ptr + yy_amount_of_matched_text; > >- yy_current_state = yy_get_previous_state( ); >+ yy_current_state = yy_get_previous_state(); > >- yy_cp = (yy_c_buf_p); >- yy_bp = (yytext_ptr) + YY_MORE_ADJ; >+ yy_cp = yy_c_buf_p; >+ yy_bp = yytext_ptr + YY_MORE_ADJ; > goto yy_match; > > case EOB_ACT_LAST_MATCH: >- (yy_c_buf_p) = >- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; >+ yy_c_buf_p = >+ &yy_current_buffer->yy_ch_buf[yy_n_chars]; > >- yy_current_state = yy_get_previous_state( ); >+ yy_current_state = yy_get_previous_state(); > >- yy_cp = (yy_c_buf_p); >- yy_bp = (yytext_ptr) + YY_MORE_ADJ; >+ yy_cp = yy_c_buf_p; >+ yy_bp = yytext_ptr + YY_MORE_ADJ; > goto yy_find_action; > } > break; >@@ -2381,7 +2295,8 @@ > "fatal flex scanner internal error--no action found" ); > } /* end of action switch */ > } /* end of scanning one token */ >-} /* end of yylex */ >+ } /* end of yylex */ >+ > > /* yy_get_next_buffer - try to read in a new buffer > * >@@ -2390,20 +2305,21 @@ > * EOB_ACT_CONTINUE_SCAN - continue scanning from current position > * EOB_ACT_END_OF_FILE - end of file > */ >-static int yy_get_next_buffer (void) >-{ >- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; >- register char *source = (yytext_ptr); >+ >+static int yy_get_next_buffer() >+ { >+ register char *dest = yy_current_buffer->yy_ch_buf; >+ register char *source = yytext_ptr; > register int number_to_move, i; > int ret_val; > >- if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) >+ if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) > YY_FATAL_ERROR( > "fatal flex scanner internal error--end of buffer missed" ); > >- if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) >+ if ( yy_current_buffer->yy_fill_buffer == 0 ) > { /* Don't try to fill the buffer, so this is an EOF. */ >- if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) >+ if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) > { > /* We matched a single character, the EOB, so > * treat this as a final EOF. >@@ -2423,30 +2339,34 @@ > /* Try to read more data. */ > > /* First move last chars to start of buffer. */ >- number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; >+ number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; > > for ( i = 0; i < number_to_move; ++i ) > *(dest++) = *(source++); > >- if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) >+ if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) > /* don't do the read, it's not guaranteed to return an EOF, > * just force an EOF > */ >- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; >+ yy_current_buffer->yy_n_chars = yy_n_chars = 0; > > else > { >- size_t num_to_read = >- YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; >+ int num_to_read = >+ yy_current_buffer->yy_buf_size - number_to_move - 1; > > while ( num_to_read <= 0 ) > { /* Not enough room in the buffer - grow it. */ >+#ifdef YY_USES_REJECT >+ YY_FATAL_ERROR( >+"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); >+#else > > /* just a shorter name for the current buffer */ >- YY_BUFFER_STATE b = YY_CURRENT_BUFFER; >+ YY_BUFFER_STATE b = yy_current_buffer; > > int yy_c_buf_p_offset = >- (int) ((yy_c_buf_p) - b->yy_ch_buf); >+ (int) (yy_c_buf_p - b->yy_ch_buf); > > if ( b->yy_is_our_buffer ) > { >@@ -2459,7 +2379,8 @@ > > b->yy_ch_buf = (char *) > /* Include room in for 2 EOB chars. */ >- yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); >+ yy_flex_realloc( (void *) b->yy_ch_buf, >+ b->yy_buf_size + 2 ); > } > else > /* Can't grow it, we don't own it. */ >@@ -2469,35 +2390,35 @@ > YY_FATAL_ERROR( > "fatal error - scanner input buffer overflow" ); > >- (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; >+ yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; > >- num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - >+ num_to_read = yy_current_buffer->yy_buf_size - > number_to_move - 1; >- >+#endif > } > > if ( num_to_read > YY_READ_BUF_SIZE ) > num_to_read = YY_READ_BUF_SIZE; > > /* Read in more data. */ >- YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), >- (yy_n_chars), num_to_read ); >+ YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), >+ yy_n_chars, num_to_read ); > >- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); >+ yy_current_buffer->yy_n_chars = yy_n_chars; > } > >- if ( (yy_n_chars) == 0 ) >+ if ( yy_n_chars == 0 ) > { > if ( number_to_move == YY_MORE_ADJ ) > { > ret_val = EOB_ACT_END_OF_FILE; >- yyrestart(yyin ); >+ yyrestart( yyin ); > } > > else > { > ret_val = EOB_ACT_LAST_MATCH; >- YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = >+ yy_current_buffer->yy_buffer_status = > YY_BUFFER_EOF_PENDING; > } > } >@@ -2505,32 +2426,33 @@ > else > ret_val = EOB_ACT_CONTINUE_SCAN; > >- (yy_n_chars) += number_to_move; >- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; >- YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; >+ yy_n_chars += number_to_move; >+ yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; >+ yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; > >- (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; >+ yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; > > return ret_val; >-} >+ } >+ > > /* yy_get_previous_state - get the state just before the EOB char was reached */ > >- static yy_state_type yy_get_previous_state (void) >-{ >+static yy_state_type yy_get_previous_state() >+ { > register yy_state_type yy_current_state; > register char *yy_cp; >- >- yy_current_state = (yy_start); >+ >+ yy_current_state = yy_start; > yy_current_state += YY_AT_BOL(); > >- for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) >+ for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) > { > register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); > if ( yy_accept[yy_current_state] ) > { >- (yy_last_accepting_state) = yy_current_state; >- (yy_last_accepting_cpos) = yy_cp; >+ yy_last_accepting_state = yy_current_state; >+ yy_last_accepting_cpos = yy_cp; > } > while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) > { >@@ -2542,23 +2464,30 @@ > } > > return yy_current_state; >-} >+ } >+ > > /* yy_try_NUL_trans - try to make a transition on the NUL character > * > * synopsis > * next_state = yy_try_NUL_trans( current_state ); > */ >- static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) >-{ >+ >+#ifdef YY_USE_PROTOS >+static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) >+#else >+static yy_state_type yy_try_NUL_trans( yy_current_state ) >+yy_state_type yy_current_state; >+#endif >+ { > register int yy_is_jam; >- register char *yy_cp = (yy_c_buf_p); >+ register char *yy_cp = yy_c_buf_p; > > register YY_CHAR yy_c = 1; > if ( yy_accept[yy_current_state] ) > { >- (yy_last_accepting_state) = yy_current_state; >- (yy_last_accepting_cpos) = yy_cp; >+ yy_last_accepting_state = yy_current_state; >+ yy_last_accepting_cpos = yy_cp; > } > while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) > { >@@ -2570,73 +2499,81 @@ > yy_is_jam = (yy_current_state == 614); > > return yy_is_jam ? 0 : yy_current_state; >-} >+ } > >- static void yyunput (int c, register char * yy_bp ) >-{ >- register char *yy_cp; >- >- yy_cp = (yy_c_buf_p); >+ >+#ifndef YY_NO_UNPUT >+#ifdef YY_USE_PROTOS >+static void yyunput( int c, register char *yy_bp ) >+#else >+static void yyunput( c, yy_bp ) >+int c; >+register char *yy_bp; >+#endif >+ { >+ register char *yy_cp = yy_c_buf_p; > > /* undo effects of setting up yytext */ >- *yy_cp = (yy_hold_char); >+ *yy_cp = yy_hold_char; > >- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) >+ if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) > { /* need to shift things up to make room */ > /* +2 for EOB chars. */ >- register int number_to_move = (yy_n_chars) + 2; >- register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ >- YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; >+ register int number_to_move = yy_n_chars + 2; >+ register char *dest = &yy_current_buffer->yy_ch_buf[ >+ yy_current_buffer->yy_buf_size + 2]; > register char *source = >- &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; >+ &yy_current_buffer->yy_ch_buf[number_to_move]; > >- while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) >+ while ( source > yy_current_buffer->yy_ch_buf ) > *--dest = *--source; > > yy_cp += (int) (dest - source); > yy_bp += (int) (dest - source); >- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = >- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; >+ yy_current_buffer->yy_n_chars = >+ yy_n_chars = yy_current_buffer->yy_buf_size; > >- if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) >+ if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) > YY_FATAL_ERROR( "flex scanner push-back overflow" ); > } > > *--yy_cp = (char) c; > >- (yytext_ptr) = yy_bp; >- (yy_hold_char) = *yy_cp; >- (yy_c_buf_p) = yy_cp; >-} >+ >+ yytext_ptr = yy_bp; >+ yy_hold_char = *yy_cp; >+ yy_c_buf_p = yy_cp; >+ } >+#endif /* ifndef YY_NO_UNPUT */ >+ > > #ifndef YY_NO_INPUT > #ifdef __cplusplus >- static int yyinput (void) >+static int yyinput() > #else >- static int input (void) >+static int input() > #endif >- >-{ >+ { > int c; >- >- *(yy_c_buf_p) = (yy_hold_char); > >- if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) >+ *yy_c_buf_p = yy_hold_char; >+ >+ if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) > { > /* yy_c_buf_p now points to the character we want to return. > * If this occurs *before* the EOB characters, then it's a > * valid NUL; if not, then we've hit the end of the buffer. > */ >- if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) >+ if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) > /* This was really a NUL. */ >- *(yy_c_buf_p) = '\0'; >+ *yy_c_buf_p = '\0'; > > else > { /* need more input */ >- int offset = (yy_c_buf_p) - (yytext_ptr); >- ++(yy_c_buf_p); >+ int offset = yy_c_buf_p - yytext_ptr; >+ ++yy_c_buf_p; > >- switch ( yy_get_next_buffer( ) ) >+ switch ( yy_get_next_buffer() ) > { > case EOB_ACT_LAST_MATCH: > /* This happens because yy_g_n_b() >@@ -2650,16 +2587,16 @@ > */ > > /* Reset buffer status. */ >- yyrestart(yyin ); >+ yyrestart( yyin ); > >- /*FALLTHROUGH*/ >+ /* fall through */ > > case EOB_ACT_END_OF_FILE: > { >- if ( yywrap( ) ) >+ if ( yywrap() ) > return EOF; > >- if ( ! (yy_did_buffer_switch_on_eof) ) >+ if ( ! yy_did_buffer_switch_on_eof ) > YY_NEW_FILE; > #ifdef __cplusplus > return yyinput(); >@@ -2669,94 +2606,91 @@ > } > > case EOB_ACT_CONTINUE_SCAN: >- (yy_c_buf_p) = (yytext_ptr) + offset; >+ yy_c_buf_p = yytext_ptr + offset; > break; > } > } > } > >- c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ >- *(yy_c_buf_p) = '\0'; /* preserve yytext */ >- (yy_hold_char) = *++(yy_c_buf_p); >+ c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ >+ *yy_c_buf_p = '\0'; /* preserve yytext */ >+ yy_hold_char = *++yy_c_buf_p; > >- YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n'); >+ yy_current_buffer->yy_at_bol = (c == '\n'); > > return c; >-} >-#endif /* ifndef YY_NO_INPUT */ >+ } >+#endif /* YY_NO_INPUT */ > >-/** Immediately switch to a different input stream. >- * @param input_file A readable stream. >- * >- * @note This function does not reset the start condition to @c INITIAL . >- */ >- void yyrestart (FILE * input_file ) >-{ >- >- if ( ! YY_CURRENT_BUFFER ){ >- yyensure_buffer_stack (); >- YY_CURRENT_BUFFER_LVALUE = >- yy_create_buffer(yyin,YY_BUF_SIZE ); >+#ifdef YY_USE_PROTOS >+void yyrestart( FILE *input_file ) >+#else >+void yyrestart( input_file ) >+FILE *input_file; >+#endif >+ { >+ if ( ! yy_current_buffer ) >+ yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); >+ >+ yy_init_buffer( yy_current_buffer, input_file ); >+ yy_load_buffer_state(); > } > >- yy_init_buffer(YY_CURRENT_BUFFER,input_file ); >- yy_load_buffer_state( ); >-} >- >-/** Switch to a different input buffer. >- * @param new_buffer The new input buffer. >- * >- */ >- void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) >-{ >- >- /* TODO. We should be able to replace this entire function body >- * with >- * yypop_buffer_state(); >- * yypush_buffer_state(new_buffer); >- */ >- yyensure_buffer_stack (); >- if ( YY_CURRENT_BUFFER == new_buffer ) >+ >+#ifdef YY_USE_PROTOS >+void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) >+#else >+void yy_switch_to_buffer( new_buffer ) >+YY_BUFFER_STATE new_buffer; >+#endif >+ { >+ if ( yy_current_buffer == new_buffer ) > return; > >- if ( YY_CURRENT_BUFFER ) >+ if ( yy_current_buffer ) > { > /* Flush out information for old buffer. */ >- *(yy_c_buf_p) = (yy_hold_char); >- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); >- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); >+ *yy_c_buf_p = yy_hold_char; >+ yy_current_buffer->yy_buf_pos = yy_c_buf_p; >+ yy_current_buffer->yy_n_chars = yy_n_chars; > } > >- YY_CURRENT_BUFFER_LVALUE = new_buffer; >- yy_load_buffer_state( ); >+ yy_current_buffer = new_buffer; >+ yy_load_buffer_state(); > > /* We don't actually know whether we did this switch during > * EOF (yywrap()) processing, but the only time this flag > * is looked at is after yywrap() is called, so it's safe > * to go ahead and always set it. > */ >- (yy_did_buffer_switch_on_eof) = 1; >-} >+ yy_did_buffer_switch_on_eof = 1; >+ } > >-static void yy_load_buffer_state (void) >-{ >- (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; >- (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; >- yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; >- (yy_hold_char) = *(yy_c_buf_p); >-} >- >-/** Allocate and initialize an input buffer state. >- * @param file A readable stream. >- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. >- * >- * @return the allocated buffer state. >- */ >- YY_BUFFER_STATE yy_create_buffer (FILE * file, int size ) >-{ >+ >+#ifdef YY_USE_PROTOS >+void yy_load_buffer_state( void ) >+#else >+void yy_load_buffer_state() >+#endif >+ { >+ yy_n_chars = yy_current_buffer->yy_n_chars; >+ yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; >+ yyin = yy_current_buffer->yy_input_file; >+ yy_hold_char = *yy_c_buf_p; >+ } >+ >+ >+#ifdef YY_USE_PROTOS >+YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) >+#else >+YY_BUFFER_STATE yy_create_buffer( file, size ) >+FILE *file; >+int size; >+#endif >+ { > YY_BUFFER_STATE b; >- >- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); >+ >+ b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); > if ( ! b ) > YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); > >@@ -2765,75 +2699,75 @@ > /* yy_ch_buf has to be 2 characters longer than the size given because > * we need to put in 2 end-of-buffer characters. > */ >- b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 ); >+ b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); > if ( ! b->yy_ch_buf ) > YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); > > b->yy_is_our_buffer = 1; > >- yy_init_buffer(b,file ); >+ yy_init_buffer( b, file ); > > return b; >-} >+ } > >-/** Destroy the buffer. >- * @param b a buffer created with yy_create_buffer() >- * >- */ >- void yy_delete_buffer (YY_BUFFER_STATE b ) >-{ >- >+ >+#ifdef YY_USE_PROTOS >+void yy_delete_buffer( YY_BUFFER_STATE b ) >+#else >+void yy_delete_buffer( b ) >+YY_BUFFER_STATE b; >+#endif >+ { > if ( ! b ) > return; > >- if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ >- YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; >+ if ( b == yy_current_buffer ) >+ yy_current_buffer = (YY_BUFFER_STATE) 0; > > if ( b->yy_is_our_buffer ) >- yyfree((void *) b->yy_ch_buf ); >+ yy_flex_free( (void *) b->yy_ch_buf ); > >- yyfree((void *) b ); >-} >+ yy_flex_free( (void *) b ); >+ } > >-#ifndef __cplusplus >-extern int isatty (int ); >-#endif /* __cplusplus */ >- >-/* Initializes or reinitializes a buffer. >- * This function is sometimes called more than once on the same buffer, >- * such as during a yyrestart() or at EOF. >- */ >- static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file ) > >-{ >- int oerrno = errno; >- >- yy_flush_buffer(b ); >+ >+#ifdef YY_USE_PROTOS >+void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) >+#else >+void yy_init_buffer( b, file ) >+YY_BUFFER_STATE b; >+FILE *file; >+#endif >+ >+ >+ { >+ yy_flush_buffer( b ); > > b->yy_input_file = file; > b->yy_fill_buffer = 1; > >- /* If b is the current buffer, then yy_init_buffer was _probably_ >- * called from yyrestart() or through yy_get_next_buffer. >- * In that case, we don't want to reset the lineno or column. >- */ >- if (b != YY_CURRENT_BUFFER){ >- b->yy_bs_lineno = 1; >- b->yy_bs_column = 0; >- } >- >- b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; >- >- errno = oerrno; >-} >- >-/** Discard all buffered characters. On the next scan, YY_INPUT will be called. >- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. >- * >- */ >- void yy_flush_buffer (YY_BUFFER_STATE b ) >-{ >- if ( ! b ) >+#if YY_ALWAYS_INTERACTIVE >+ b->yy_is_interactive = 1; >+#else >+#if YY_NEVER_INTERACTIVE >+ b->yy_is_interactive = 0; >+#else >+ b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; >+#endif >+#endif >+ } >+ >+ >+#ifdef YY_USE_PROTOS >+void yy_flush_buffer( YY_BUFFER_STATE b ) >+#else >+void yy_flush_buffer( b ) >+YY_BUFFER_STATE b; >+#endif >+ >+ { >+ if ( ! b ) > return; > > b->yy_n_chars = 0; >@@ -2850,121 +2784,29 @@ > b->yy_at_bol = 1; > b->yy_buffer_status = YY_BUFFER_NEW; > >- if ( b == YY_CURRENT_BUFFER ) >- yy_load_buffer_state( ); >-} >- >-/** Pushes the new state onto the stack. The new state becomes >- * the current state. This function will allocate the stack >- * if necessary. >- * @param new_buffer The new state. >- * >- */ >-void yypush_buffer_state (YY_BUFFER_STATE new_buffer ) >-{ >- if (new_buffer == NULL) >- return; >- >- yyensure_buffer_stack(); >- >- /* This block is copied from yy_switch_to_buffer. */ >- if ( YY_CURRENT_BUFFER ) >- { >- /* Flush out information for old buffer. */ >- *(yy_c_buf_p) = (yy_hold_char); >- YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); >- YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); >- } >- >- /* Only push if top exists. Otherwise, replace top. */ >- if (YY_CURRENT_BUFFER) >- (yy_buffer_stack_top)++; >- YY_CURRENT_BUFFER_LVALUE = new_buffer; >- >- /* copied from yy_switch_to_buffer. */ >- yy_load_buffer_state( ); >- (yy_did_buffer_switch_on_eof) = 1; >-} >- >-/** Removes and deletes the top of the stack, if present. >- * The next element becomes the new top. >- * >- */ >-void yypop_buffer_state (void) >-{ >- if (!YY_CURRENT_BUFFER) >- return; >- >- yy_delete_buffer(YY_CURRENT_BUFFER ); >- YY_CURRENT_BUFFER_LVALUE = NULL; >- if ((yy_buffer_stack_top) > 0) >- --(yy_buffer_stack_top); >- >- if (YY_CURRENT_BUFFER) { >- yy_load_buffer_state( ); >- (yy_did_buffer_switch_on_eof) = 1; >+ if ( b == yy_current_buffer ) >+ yy_load_buffer_state(); > } >-} > >-/* Allocates the stack if it does not exist. >- * Guarantees space for at least one push. >- */ >-static void yyensure_buffer_stack (void) >-{ >- int num_to_alloc; >- >- if (!(yy_buffer_stack)) { >- >- /* First allocation is just for 2 elements, since we don't know if this >- * scanner will even need a stack. We use 2 instead of 1 to avoid an >- * immediate realloc on the next call. >- */ >- num_to_alloc = 1; >- (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc >- (num_to_alloc * sizeof(struct yy_buffer_state*) >- ); >- >- memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); >- >- (yy_buffer_stack_max) = num_to_alloc; >- (yy_buffer_stack_top) = 0; >- return; >- } >- >- if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ >- >- /* Increase the buffer to prepare for a possible push. */ >- int grow_size = 8 /* arbitrary grow size */; > >- num_to_alloc = (yy_buffer_stack_max) + grow_size; >- (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc >- ((yy_buffer_stack), >- num_to_alloc * sizeof(struct yy_buffer_state*) >- ); >- >- /* zero only the new slots.*/ >- memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); >- (yy_buffer_stack_max) = num_to_alloc; >- } >-} >- >-/** Setup the input buffer state to scan directly from a user-specified character buffer. >- * @param base the character buffer >- * @param size the size in bytes of the character buffer >- * >- * @return the newly allocated buffer state object. >- */ >-YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size ) >-{ >+#ifndef YY_NO_SCAN_BUFFER >+#ifdef YY_USE_PROTOS >+YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) >+#else >+YY_BUFFER_STATE yy_scan_buffer( base, size ) >+char *base; >+yy_size_t size; >+#endif >+ { > YY_BUFFER_STATE b; >- >+ > if ( size < 2 || > base[size-2] != YY_END_OF_BUFFER_CHAR || > base[size-1] != YY_END_OF_BUFFER_CHAR ) > /* They forgot to leave room for the EOB's. */ > return 0; > >- b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) ); >+ b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); > if ( ! b ) > YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); > >@@ -2978,42 +2820,47 @@ > b->yy_fill_buffer = 0; > b->yy_buffer_status = YY_BUFFER_NEW; > >- yy_switch_to_buffer(b ); >+ yy_switch_to_buffer( b ); > > return b; >-} >+ } >+#endif > >-/** Setup the input buffer state to scan a string. The next call to yylex() will >- * scan from a @e copy of @a str. >- * @param str a NUL-terminated string to scan >- * >- * @return the newly allocated buffer state object. >- * @note If you want to scan bytes that may contain NUL values, then use >- * yy_scan_bytes() instead. >- */ >-YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str ) >-{ >- >- return yy_scan_bytes(yy_str,strlen(yy_str) ); >-} >- >-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will >- * scan from a @e copy of @a bytes. >- * @param bytes the byte buffer to scan >- * @param len the number of bytes in the buffer pointed to by @a bytes. >- * >- * @return the newly allocated buffer state object. >- */ >-YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len ) >-{ >+ >+#ifndef YY_NO_SCAN_STRING >+#ifdef YY_USE_PROTOS >+YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) >+#else >+YY_BUFFER_STATE yy_scan_string( yy_str ) >+yyconst char *yy_str; >+#endif >+ { >+ int len; >+ for ( len = 0; yy_str[len]; ++len ) >+ ; >+ >+ return yy_scan_bytes( yy_str, len ); >+ } >+#endif >+ >+ >+#ifndef YY_NO_SCAN_BYTES >+#ifdef YY_USE_PROTOS >+YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) >+#else >+YY_BUFFER_STATE yy_scan_bytes( bytes, len ) >+yyconst char *bytes; >+int len; >+#endif >+ { > YY_BUFFER_STATE b; > char *buf; > yy_size_t n; > int i; >- >+ > /* Get memory for full buffer, including space for trailing EOB's. */ > n = len + 2; >- buf = (char *) yyalloc(n ); >+ buf = (char *) yy_flex_alloc( n ); > if ( ! buf ) > YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); > >@@ -3022,7 +2869,7 @@ > > buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; > >- b = yy_scan_buffer(buf,n ); >+ b = yy_scan_buffer( buf, n ); > if ( ! b ) > YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); > >@@ -3032,164 +2879,148 @@ > b->yy_is_our_buffer = 1; > > return b; >-} >- >-#ifndef YY_EXIT_FAILURE >-#define YY_EXIT_FAILURE 2 >+ } > #endif > >-static void yy_fatal_error (yyconst char* msg ) >-{ >- (void) fprintf( stderr, "%s\n", msg ); >- exit( YY_EXIT_FAILURE ); >-} > >-/* Redefine yyless() so it works in section 3 code. */ >+#ifndef YY_NO_PUSH_STATE >+#ifdef YY_USE_PROTOS >+static void yy_push_state( int new_state ) >+#else >+static void yy_push_state( new_state ) >+int new_state; >+#endif >+ { >+ if ( yy_start_stack_ptr >= yy_start_stack_depth ) >+ { >+ yy_size_t new_size; > >-#undef yyless >-#define yyless(n) \ >- do \ >- { \ >- /* Undo effects of setting up yytext. */ \ >- int yyless_macro_arg = (n); \ >- YY_LESS_LINENO(yyless_macro_arg);\ >- yytext[yyleng] = (yy_hold_char); \ >- (yy_c_buf_p) = yytext + yyless_macro_arg; \ >- (yy_hold_char) = *(yy_c_buf_p); \ >- *(yy_c_buf_p) = '\0'; \ >- yyleng = yyless_macro_arg; \ >- } \ >- while ( 0 ) >+ yy_start_stack_depth += YY_START_STACK_INCR; >+ new_size = yy_start_stack_depth * sizeof( int ); > >-/* Accessor methods (get/set functions) to struct members. */ >+ if ( ! yy_start_stack ) >+ yy_start_stack = (int *) yy_flex_alloc( new_size ); > >-/** Get the current line number. >- * >- */ >-int yyget_lineno (void) >-{ >- >- return yylineno; >-} >+ else >+ yy_start_stack = (int *) yy_flex_realloc( >+ (void *) yy_start_stack, new_size ); > >-/** Get the input stream. >- * >- */ >-FILE *yyget_in (void) >-{ >- return yyin; >-} >+ if ( ! yy_start_stack ) >+ YY_FATAL_ERROR( >+ "out of memory expanding start-condition stack" ); >+ } > >-/** Get the output stream. >- * >- */ >-FILE *yyget_out (void) >-{ >- return yyout; >-} >+ yy_start_stack[yy_start_stack_ptr++] = YY_START; > >-/** Get the length of the current token. >- * >- */ >-int yyget_leng (void) >-{ >- return yyleng; >-} >+ BEGIN(new_state); >+ } >+#endif > >-/** Get the current token. >- * >- */ > >-char *yyget_text (void) >-{ >- return yytext; >-} >+#ifndef YY_NO_POP_STATE >+static void yy_pop_state() >+ { >+ if ( --yy_start_stack_ptr < 0 ) >+ YY_FATAL_ERROR( "start-condition stack underflow" ); > >-/** Set the current line number. >- * @param line_number >- * >- */ >-void yyset_lineno (int line_number ) >-{ >- >- yylineno = line_number; >-} >- >-/** Set the input stream. This does not discard the current >- * input buffer. >- * @param in_str A readable stream. >- * >- * @see yy_switch_to_buffer >- */ >-void yyset_in (FILE * in_str ) >-{ >- yyin = in_str ; >-} >+ BEGIN(yy_start_stack[yy_start_stack_ptr]); >+ } >+#endif > >-void yyset_out (FILE * out_str ) >-{ >- yyout = out_str ; >-} > >-int yyget_debug (void) >-{ >- return yy_flex_debug; >-} >+#ifndef YY_NO_TOP_STATE >+static int yy_top_state() >+ { >+ return yy_start_stack[yy_start_stack_ptr - 1]; >+ } >+#endif > >-void yyset_debug (int bdebug ) >-{ >- yy_flex_debug = bdebug ; >-} >+#ifndef YY_EXIT_FAILURE >+#define YY_EXIT_FAILURE 2 >+#endif > >-/* yylex_destroy is for both reentrant and non-reentrant scanners. */ >-int yylex_destroy (void) >-{ >- >- /* Pop the buffer stack, destroying each element. */ >- while(YY_CURRENT_BUFFER){ >- yy_delete_buffer(YY_CURRENT_BUFFER ); >- YY_CURRENT_BUFFER_LVALUE = NULL; >- yypop_buffer_state(); >+#ifdef YY_USE_PROTOS >+static void yy_fatal_error( yyconst char msg[] ) >+#else >+static void yy_fatal_error( msg ) >+char msg[]; >+#endif >+ { >+ (void) fprintf( stderr, "%s\n", msg ); >+ exit( YY_EXIT_FAILURE ); > } > >- /* Destroy the stack itself. */ >- yyfree((yy_buffer_stack) ); >- (yy_buffer_stack) = NULL; > >- return 0; >-} > >-/* >- * Internal utility routines. >- */ >+/* Redefine yyless() so it works in section 3 code. */ >+ >+#undef yyless >+#define yyless(n) \ >+ do \ >+ { \ >+ /* Undo effects of setting up yytext. */ \ >+ yytext[yyleng] = yy_hold_char; \ >+ yy_c_buf_p = yytext + n; \ >+ yy_hold_char = *yy_c_buf_p; \ >+ *yy_c_buf_p = '\0'; \ >+ yyleng = n; \ >+ } \ >+ while ( 0 ) >+ >+ >+/* Internal utility routines. */ > > #ifndef yytext_ptr >-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) >-{ >+#ifdef YY_USE_PROTOS >+static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) >+#else >+static void yy_flex_strncpy( s1, s2, n ) >+char *s1; >+yyconst char *s2; >+int n; >+#endif >+ { > register int i; >- for ( i = 0; i < n; ++i ) >+ for ( i = 0; i < n; ++i ) > s1[i] = s2[i]; >-} >+ } > #endif > > #ifdef YY_NEED_STRLEN >-static int yy_flex_strlen (yyconst char * s ) >-{ >+#ifdef YY_USE_PROTOS >+static int yy_flex_strlen( yyconst char *s ) >+#else >+static int yy_flex_strlen( s ) >+yyconst char *s; >+#endif >+ { > register int n; >- for ( n = 0; s[n]; ++n ) >+ for ( n = 0; s[n]; ++n ) > ; > > return n; >-} >+ } > #endif > >-void *yyalloc (yy_size_t size ) >-{ >+ >+#ifdef YY_USE_PROTOS >+static void *yy_flex_alloc( yy_size_t size ) >+#else >+static void *yy_flex_alloc( size ) >+yy_size_t size; >+#endif >+ { > return (void *) malloc( size ); >-} >+ } > >-void *yyrealloc (void * ptr, yy_size_t size ) >-{ >+#ifdef YY_USE_PROTOS >+static void *yy_flex_realloc( void *ptr, yy_size_t size ) >+#else >+static void *yy_flex_realloc( ptr, size ) >+void *ptr; >+yy_size_t size; >+#endif >+ { > /* The cast to (char *) in the following accommodates both > * implementations that use char* generic pointers, and those > * that use void* generic pointers. It works with the latter >@@ -3198,30 +3029,26 @@ > * as though doing an assignment. > */ > return (void *) realloc( (char *) ptr, size ); >-} >- >-void yyfree (void * ptr ) >-{ >- free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ >-} >+ } > >-#define YYTABLES_NAME "yytables" >+#ifdef YY_USE_PROTOS >+static void yy_flex_free( void *ptr ) >+#else >+static void yy_flex_free( ptr ) >+void *ptr; >+#endif >+ { >+ free( ptr ); >+ } > >-#undef YY_NEW_FILE >-#undef YY_FLUSH_BUFFER >-#undef yy_set_bol >-#undef yy_new_buffer >-#undef yy_set_interactive >-#undef yytext_ptr >-#undef YY_DO_BEFORE_ACTION >- >-#ifdef YY_DECL_IS_OURS >-#undef YY_DECL_IS_OURS >-#undef YY_DECL >+#if YY_MAIN >+int main() >+ { >+ yylex(); >+ return 0; >+ } > #endif > #line 493 "moc.l" > > >- > #endif // MOC_YACC_CODE >- >diff -ruN qt-x11-commercial-3.3.8/src/moc/moc_yacc.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/moc/moc_yacc.cpp >--- qt-x11-commercial-3.3.8/src/moc/moc_yacc.cpp 2007-03-23 10:21:29.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/moc/moc_yacc.cpp 2007-03-23 10:21:13.000000000 -0400 >@@ -1,12 +1,17 @@ > #ifndef lint >-static char yysccsid[] = "@(#)yaccpar 1.9 (Berkeley) 02/21/93"; >+static char const >+yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $"; > #endif >+#include <stdlib.h> > #define YYBYACC 1 > #define YYMAJOR 1 > #define YYMINOR 9 >-#define yyclearin (yychar=(-1)) >+#define YYLEX yylex() >+#define YYEMPTY -1 >+#define yyclearin (yychar=(YYEMPTY)) > #define yyerrok (yyerrflag=0) >-#define YYRECOVERING (yyerrflag!=0) >+#define YYRECOVERING() (yyerrflag!=0) >+static int yygrowstack(); > #define YYPREFIX "yy" > #line 55 "moc.y" > #define MOC_YACC_CODE >@@ -649,7 +654,8 @@ > ArgList *arg_list; > Argument *arg; > } YYSTYPE; >-#line 653 "y.tab.c" >+#line 658 "y.tab.c" >+#define YYERRCODE 256 > #define CHAR_VAL 257 > #define INT_VAL 258 > #define DOUBLE_VAL 259 >@@ -704,8 +710,7 @@ > #define DESIGNABLE 308 > #define SCRIPTABLE 309 > #define RESET 310 >-#define YYERRCODE 256 >-short yylhs[] = { -1, >+const short yylhs[] = { -1, > 0, 0, 40, 40, 40, 40, 40, 42, 42, 48, > 50, 46, 51, 52, 47, 49, 43, 45, 44, 44, > 54, 41, 1, 1, 2, 55, 56, 57, 58, 30, >@@ -740,7 +745,7 @@ > 134, 134, 135, 136, 135, 138, 97, 137, 137, 137, > 137, 137, 137, 137, 105, 105, 108, 108, > }; >-short yylen[] = { 2, >+const short yylen[] = { 2, > 0, 2, 1, 1, 1, 1, 1, 1, 1, 0, > 0, 7, 0, 0, 6, 1, 5, 2, 2, 2, > 0, 3, 1, 1, 4, 0, 0, 0, 0, 1, >@@ -775,7 +780,7 @@ > 1, 3, 1, 0, 4, 0, 4, 0, 3, 3, > 3, 3, 3, 3, 0, 2, 0, 2, > }; >-short yydefred[] = { 1, >+const short yydefred[] = { 1, > 0, 0, 0, 2, 3, 4, 5, 6, 7, 8, > 9, 0, 0, 0, 19, 20, 18, 0, 0, 0, > 0, 0, 0, 0, 0, 0, 14, 26, 140, 40, >@@ -826,7 +831,7 @@ > 28, 96, 102, 27, 156, 79, 0, 131, 0, 128, > 105, 129, 89, 0, 151, 0, 0, 158, 132, 130, > }; >-short yydgoto[] = { 93, >+const short yydgoto[] = { 93, > 53, 54, 162, 64, 65, 85, 86, 87, 88, 163, > 164, 165, 166, 167, 168, 69, 169, 48, 318, 319, > 320, 365, 366, 321, 477, 302, 303, 304, 322, 170, >@@ -842,7 +847,7 @@ > 180, 181, 245, 376, 182, 315, 402, 377, 441, 416, > 324, 199, 344, 270, 271, 395, 385, 329, > }; >-short yysindex[] = { 0, >+const short yysindex[] = { 0, > 70, -206, -111, 0, 0, 0, 0, 0, 0, 0, > 0, -220, 41, 10, 0, 0, 0, 67, 912, -96, > 152, 124, 91, 559, -81, 98, 0, 0, 0, 0, >@@ -893,7 +898,7 @@ > 0, 0, 0, 0, 0, 0, 991, 0, 799, 0, > 0, 0, 0, 1015, 0, 936, 1004, 0, 0, 0, > }; >-short yyrindex[] = { 0, >+const short yyrindex[] = { 0, > 330, 941, 0, 0, 0, 0, 0, 0, 0, 0, > 0, 199, 943, 0, 0, 0, 0, 0, 373, 0, > 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, >@@ -944,7 +949,7 @@ > 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > }; >-short yygindex[] = { 1152, >+const short yygindex[] = { 1152, > 347, 0, 1150, 930, 0, 0, 435, 1056, 449, 283, > -135, 0, 57, -11, -25, 122, 0, 0, 0, 0, > 0, 765, 810, -294, 0, -159, 0, 892, 0, -10, >@@ -961,7 +966,7 @@ > 0, 0, 931, 1005, 974, 0, 856, 0, > }; > #define YYTABLESIZE 1510 >-short yytable[] = { 68, >+const short yytable[] = { 68, > 20, 226, 218, 77, 63, 225, 90, 228, 123, 90, > 123, 123, 123, 90, 123, 149, 90, 84, 372, 122, > 84, 122, 122, 122, 87, 122, 90, 87, 123, 123, >@@ -1114,7 +1119,7 @@ > 154, 155, 30, 31, 32, 33, 34, 35, 36, 37, > 0, 38, 39, 40, 41, 42, 43, 44, 45, 46, > }; >-short yycheck[] = { 25, >+const short yycheck[] = { 25, > 12, 38, 159, 41, 58, 42, 41, 164, 38, 44, > 40, 41, 42, 41, 44, 58, 44, 41, 40, 38, > 44, 40, 41, 42, 41, 44, 61, 44, 58, 59, >@@ -1273,7 +1278,7 @@ > #endif > #define YYMAXTOKEN 310 > #if YYDEBUG >-char *yyname[] = { >+const char * const yyname[] = { > "end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, > "'!'",0,0,0,"'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,"'/'",0,0,0,0,0, > 0,0,0,0,0,"':'","';'","'<'","'='","'>'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, >@@ -1290,7 +1295,7 @@ > "Q_OBJECT","Q_PROPERTY","Q_OVERRIDE","Q_CLASSINFO","Q_ENUMS","Q_SETS","READ", > "WRITE","STORED","DESIGNABLE","SCRIPTABLE","RESET", > }; >-char *yyrule[] = { >+const char * const yyrule[] = { > "$accept : declaration_seq", > "declaration_seq :", > "declaration_seq : declaration_seq declaration", >@@ -1622,6 +1627,9 @@ > "qt_sets : IDENTIFIER qt_sets", > }; > #endif >+#if YYDEBUG >+#include <stdio.h> >+#endif > #ifdef YYSTACKSIZE > #undef YYMAXDEPTH > #define YYMAXDEPTH YYSTACKSIZE >@@ -1629,10 +1637,11 @@ > #ifdef YYMAXDEPTH > #define YYSTACKSIZE YYMAXDEPTH > #else >-#define YYSTACKSIZE 500 >-#define YYMAXDEPTH 500 >+#define YYSTACKSIZE 10000 >+#define YYMAXDEPTH 10000 > #endif > #endif >+#define YYINITSTACKSIZE 200 > int yydebug; > int yynerrs; > int yyerrflag; >@@ -1641,9 +1650,10 @@ > YYSTYPE *yyvsp; > YYSTYPE yyval; > YYSTYPE yylval; >-short yyss[YYSTACKSIZE]; >-YYSTYPE yyvs[YYSTACKSIZE]; >-#define yystacksize YYSTACKSIZE >+short *yyss; >+short *yysslim; >+YYSTYPE *yyvs; >+int yystacksize; > #line 1606 "moc.y" > > #ifndef YYBISON >@@ -2873,7 +2883,7 @@ > const char *hdr1 = "/****************************************************************************\n" > "** %s meta object code from reading C++ file '%s'\n**\n"; > const char *hdr2 = "** Created: %s\n" >- "** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $)\n**\n"; >+ "** by: The Qt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Mar 23 02:24 $)\n**\n"; > const char *hdr3 = "** WARNING! All changes made in this file will be lost!\n"; > const char *hdr4 = "*****************************************************************************/\n\n"; > int i; >@@ -3645,20 +3655,73 @@ > return; > } > } >-#line 3649 "y.tab.c" >+#line 3659 "y.tab.c" >+/* allocate initial stack or double stack size, up to YYMAXDEPTH */ >+static int yygrowstack() >+{ >+ int newsize, i; >+ short *newss; >+ YYSTYPE *newvs; >+ >+ if ((newsize = yystacksize) == 0) >+ newsize = YYINITSTACKSIZE; >+ else if (newsize >= YYMAXDEPTH) >+ return -1; >+ else if ((newsize *= 2) > YYMAXDEPTH) >+ newsize = YYMAXDEPTH; >+ i = yyssp - yyss; >+ newss = yyss ? (short *)realloc(yyss, newsize * sizeof *newss) : >+ (short *)malloc(newsize * sizeof *newss); >+ if (newss == NULL) >+ return -1; >+ yyss = newss; >+ yyssp = newss + i; >+ newvs = yyvs ? (YYSTYPE *)realloc(yyvs, newsize * sizeof *newvs) : >+ (YYSTYPE *)malloc(newsize * sizeof *newvs); >+ if (newvs == NULL) >+ return -1; >+ yyvs = newvs; >+ yyvsp = newvs + i; >+ yystacksize = newsize; >+ yysslim = yyss + newsize - 1; >+ return 0; >+} >+ > #define YYABORT goto yyabort > #define YYREJECT goto yyabort > #define YYACCEPT goto yyaccept > #define YYERROR goto yyerrlab >+ >+#ifndef YYPARSE_PARAM >+#if defined(__cplusplus) || __STDC__ >+#define YYPARSE_PARAM_ARG void >+#define YYPARSE_PARAM_DECL >+#else /* ! ANSI-C/C++ */ >+#define YYPARSE_PARAM_ARG >+#define YYPARSE_PARAM_DECL >+#endif /* ANSI-C/C++ */ >+#else /* YYPARSE_PARAM */ >+#ifndef YYPARSE_PARAM_TYPE >+#define YYPARSE_PARAM_TYPE void * >+#endif >+#if defined(__cplusplus) || __STDC__ >+#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM >+#define YYPARSE_PARAM_DECL >+#else /* ! ANSI-C/C++ */ >+#define YYPARSE_PARAM_ARG YYPARSE_PARAM >+#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM; >+#endif /* ANSI-C/C++ */ >+#endif /* ! YYPARSE_PARAM */ >+ > int >-yyparse() >+yyparse (YYPARSE_PARAM_ARG) >+ YYPARSE_PARAM_DECL > { > register int yym, yyn, yystate; > #if YYDEBUG >- register char *yys; >- extern char *getenv(); >+ register const char *yys; > >- if (yys = getenv("YYDEBUG")) >+ if ((yys = getenv("YYDEBUG"))) > { > yyn = *yys; > if (yyn >= '0' && yyn <= '9') >@@ -3670,12 +3733,13 @@ > yyerrflag = 0; > yychar = (-1); > >+ if (yyss == NULL && yygrowstack()) goto yyoverflow; > yyssp = yyss; > yyvsp = yyvs; > *yyssp = yystate = 0; > > yyloop: >- if (yyn = yydefred[yystate]) goto yyreduce; >+ if ((yyn = yydefred[yystate])) goto yyreduce; > if (yychar < 0) > { > if ((yychar = yylex()) < 0) yychar = 0; >@@ -3698,7 +3762,7 @@ > printf("%sdebug: state %d, shifting to state %d\n", > YYPREFIX, yystate, yytable[yyn]); > #endif >- if (yyssp >= yyss + yystacksize - 1) >+ if (yyssp >= yysslim && yygrowstack()) > { > goto yyoverflow; > } >@@ -3715,12 +3779,12 @@ > goto yyreduce; > } > if (yyerrflag) goto yyinrecovery; >-#ifdef lint >+#if defined(lint) || defined(__GNUC__) > goto yynewerror; > #endif > yynewerror: > yyerror("syntax error"); >-#ifdef lint >+#if defined(lint) || defined(__GNUC__) > goto yyerrlab; > #endif > yyerrlab: >@@ -3739,7 +3803,7 @@ > printf("%sdebug: state %d, error recovery shifting\ > to state %d\n", YYPREFIX, *yyssp, yytable[yyn]); > #endif >- if (yyssp >= yyss + yystacksize - 1) >+ if (yyssp >= yysslim && yygrowstack()) > { > goto yyoverflow; > } >@@ -4755,7 +4819,7 @@ > #line 1602 "moc.y" > { g->qtSets.append( yyvsp[-1].string ); } > break; >-#line 4759 "y.tab.c" >+#line 4823 "y.tab.c" > } > yyssp -= yym; > yystate = *yyssp; >@@ -4798,7 +4862,7 @@ > printf("%sdebug: after reduction, shifting from state %d \ > to state %d\n", YYPREFIX, *yyssp, yystate); > #endif >- if (yyssp >= yyss + yystacksize - 1) >+ if (yyssp >= yysslim && yygrowstack()) > { > goto yyoverflow; > } >diff -ruN qt-x11-commercial-3.3.8/src/moc/moc_yacc.h qt-x11-commercial-3.3.8-snapshot-20070323/src/moc/moc_yacc.h >--- qt-x11-commercial-3.3.8/src/moc/moc_yacc.h 2007-03-23 10:21:29.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/moc/moc_yacc.h 2007-03-23 10:21:13.000000000 -0400 >@@ -1,3 +1,7 @@ >+#ifndef YYERRCODE >+#define YYERRCODE 256 >+#endif >+ > #define CHAR_VAL 257 > #define INT_VAL 258 > #define DOUBLE_VAL 259 >diff -ruN qt-x11-commercial-3.3.8/src/opengl/qgl.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/opengl/qgl.cpp >--- qt-x11-commercial-3.3.8/src/opengl/qgl.cpp 2007-03-23 10:21:33.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/opengl/qgl.cpp 2007-03-23 10:21:18.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qgl.cpp 3.3.8 edited Jan 11 14:38 $ >+** $Id: qt/qgl.cpp 3.3.8 edited Mar 22 11:48 $ > ** > ** Implementation of OpenGL classes for Qt > ** >@@ -2201,6 +2201,8 @@ > > void QGLWidget::renderText( int x, int y, const QString & str, const QFont & fnt, int listBase ) > { >+ if (str.isEmpty()) >+ return; > makeCurrent(); > glPushAttrib( GL_TRANSFORM_BIT | GL_VIEWPORT_BIT | GL_LIST_BIT | GL_CURRENT_BIT ); > glMatrixMode( GL_PROJECTION ); >@@ -2215,7 +2217,7 @@ > glBitmap(0, 0, 0, 0, x, -y, NULL); > glListBase( displayListBase( fnt, listBase ) ); > const char *cstr = str.latin1(); >- glCallLists( strlen(cstr), GL_UNSIGNED_BYTE, cstr ); >+ glCallLists( qstrlen(cstr), GL_UNSIGNED_BYTE, cstr ); > > // restore the matrix stacks and GL state > glPopMatrix(); >@@ -2234,12 +2236,14 @@ > void QGLWidget::renderText( double x, double y, double z, const QString & str, const QFont & fnt, > int listBase ) > { >+ if (str.isEmpty()) >+ return; > makeCurrent(); > glRasterPos3d( x, y, z ); > glPushAttrib( GL_LIST_BIT ); > glListBase( displayListBase( fnt, listBase ) ); > const char *cstr = str.latin1(); >- glCallLists( strlen(cstr), GL_UNSIGNED_BYTE, cstr ); >+ glCallLists( qstrlen(cstr), GL_UNSIGNED_BYTE, cstr ); > glPopAttrib(); > } > >diff -ruN qt-x11-commercial-3.3.8/src/sql/drivers/psql/qsql_psql.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/sql/drivers/psql/qsql_psql.cpp >--- qt-x11-commercial-3.3.8/src/sql/drivers/psql/qsql_psql.cpp 2007-03-23 10:21:29.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/sql/drivers/psql/qsql_psql.cpp 2007-03-23 10:21:18.000000000 -0400 >@@ -56,6 +56,9 @@ > #define errno qt_psql_errno > #include <catalog/pg_type.h> > #undef errno >+#ifdef open >+# undef open >+#endif > > QPtrDict<QSqlDriverExtension> *qSqlDriverExtDict(); > QPtrDict<QSqlOpenExtension> *qSqlOpenExtDict(); >diff -ruN qt-x11-commercial-3.3.8/src/tools/qdatetime.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/tools/qdatetime.cpp >--- qt-x11-commercial-3.3.8/src/tools/qdatetime.cpp 2007-03-23 10:21:30.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/tools/qdatetime.cpp 2007-03-23 10:21:16.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qdatetime.cpp 3.3.8 edited Jan 11 14:38 $ >+** $Id: qt/qdatetime.cpp 3.3.8 edited Mar 21 22:57 $ > ** > ** Implementation of date and time classes > ** >@@ -2485,7 +2485,7 @@ > return dt; > } > #endif >- int day = s.mid( firstSpace + 4, 2 ).simplifyWhiteSpace().toInt(); >+ int day = s.mid( firstSpace + 5, 2 ).simplifyWhiteSpace().toInt(); > int year = s.right( 4 ).toInt(); > QDate date( year, month, day ); > QTime time; >diff -ruN qt-x11-commercial-3.3.8/src/tools/qglobal.h qt-x11-commercial-3.3.8-snapshot-20070323/src/tools/qglobal.h >--- qt-x11-commercial-3.3.8/src/tools/qglobal.h 2007-03-23 10:21:30.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/tools/qglobal.h 2007-03-23 10:21:16.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qglobal.h 3.3.8 edited Feb 2 15:00 $ >+** $Id: qt/qglobal.h 3.3.8 edited Mar 23 02:24 $ > ** > ** Global type declarations and definitions > ** >diff -ruN qt-x11-commercial-3.3.8/src/tools/qstring.cpp qt-x11-commercial-3.3.8-snapshot-20070323/src/tools/qstring.cpp >--- qt-x11-commercial-3.3.8/src/tools/qstring.cpp 2007-03-23 10:21:30.000000000 -0400 >+++ qt-x11-commercial-3.3.8-snapshot-20070323/src/tools/qstring.cpp 2007-03-23 10:21:17.000000000 -0400 >@@ -1,5 +1,5 @@ > /**************************************************************************** >-** $Id: qt/qstring.cpp 3.3.8 edited Jan 11 16:03 $ >+** $Id: qt/qstring.cpp 3.3.8 edited Mar 20 15:39 $ > ** > ** Implementation of the QString class and related Unicode functions > ** >@@ -5805,6 +5805,7 @@ > result.setLength( len ); // worst case > QChar *qch = (QChar *)result.unicode(); > uint uc = 0; >+ uint min_uc = 0; > int need = 0; > int error = -1; > uchar ch; >@@ -5822,7 +5823,13 @@ > unsigned short low = uc%0x400 + 0xdc00; > *qch++ = QChar(high); > *qch++ = QChar(low); >- } else { >+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { >+ // overlong seqence, UTF16 surrogate or BOM >+ i = error; >+ qch = addOne(qch, result); >+ *qch++ = QChar(0xdbff); >+ *qch++ = QChar(0xde00+((uchar)utf8[i])); >+ } else { > *qch++ = uc; > } > } >@@ -5844,14 +5851,17 @@ > uc = ch & 0x1f; > need = 1; > error = i; >+ min_uc = 0x80; > } else if ((ch & 0xf0) == 0xe0) { > uc = ch & 0x0f; > need = 2; > error = i; >+ min_uc = 0x800; > } else if ((ch&0xf8) == 0xf0) { > uc = ch & 0x07; > need = 3; > error = i; >+ min_uc = 0x10000; > } else { > // Error > qch = addOne(qch, result); >@@ -6038,11 +6048,11 @@ > /*! > \fn QString::operator std::string() const > >- Returns ascii() as a std::string. >- >- \warning The function may cause an application to crash if a static C run-time is in use. >- This can happen in Microsoft Visual C++ if Qt is configured as single-threaded. A safe >- alternative is to call ascii() directly and construct a std::string manually. >+ Returns ascii() as a std::string. >+ >+ \warning The function may cause an application to crash if a static C run-time is in use. >+ This can happen in Microsoft Visual C++ if Qt is configured as single-threaded. A safe >+ alternative is to call ascii() directly and construct a std::string manually. > */ > > /*!
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=114127">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 171883
: 114127 |
114131
